kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-27 06:03:51 +03:00
Code Issues Projects Releases Wiki Activity

fix badge text warning and border.color

Browse Source
This commit is contained in:
Michail Vourlakos 2018-07-23 19:35:09 +03:00
parent f3bc0b4c0b
commit 3ea01dfafc
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containment/package/contents/ui/applet/AppletItemWrapper.qml
View File

@ -636,6 +636,7 @@ Item{
minimumWidth: 0.4 * root.iconSize
height: width
border.color: root.minimizedDotColor
numberValue: appletNumberLoader.fixedIndex < 10 ? appletNumberLoader.fixedIndex : 0
Binding{

3
containment/package/contents/ui/main.qml
View File

@ -376,6 +376,8 @@ DragDrop.DropArea {
}
property rect screenGeometry: dock ? dock.screenGeometry : plasmoid.screenGeometry
readonly property color minimizedDotColor: colorizerLoader.minimizedDotColor
///END properties from latteApplet
/* Layout.preferredWidth: plasmoid.immutable ?
@ -1772,6 +1774,7 @@ DragDrop.DropArea {
readonly property real themeBackgroundColorLuma: 0.2126*backColorRs + 0.7152*backColorGs + 0.0722*backColorBs
readonly property real themeTextColorLuma: 0.2126*textColorRs + 0.7152*textColorGs + 0.0722*textColorBs
readonly property color minimizedDotColor: themeTextColorLuma > 0.6 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
property bool isShown: active && !forceSolidPanel
//! when forceSemiTransparentPanel is enabled because of snapped or maximized etc. windows

5
liblattedock/qml/BadgeText.qml
View File

@ -56,7 +56,6 @@ Rectangle {
color: theme.backgroundColor //mainItemContainer.badgeIndicator > 0 ? alphaBackColor2 : alphaBackColor
radius: (radiusPerCentage / 100) * (height / 2)
border.width: Math.max(1,width/64)
border.color: root.minimizedDotColor //alphaBackColor2
onProportionChanged: {
// console.log(previousProportion + " - "+proportion);
@ -128,14 +127,14 @@ Rectangle {
return i18nc("Over 9999 new messages, overlay, keep short", "9,999+");
} else if (numberValue > 0) {
return numberValue.toLocaleString(Qt.locale(), 'f', 0);
} else {
return "";
}
}
if (showText) {
return textValue;
}
return "";
}
font.pixelSize: 0.55 * parent.height
font.bold: true

8
plasmoid/package/contents/ui/main.qml
View File

@ -124,7 +124,13 @@ Item {
}
property real textColorLuma: 0.2126*textColorRs + 0.7152*textColorGs + 0.0722*textColorBs
property color minimizedDotColor: textColorLuma > 0.6 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
property color minimizedDotColor: {
if (latteDock) {
return latteDock.minimizedDotColor;
}
return textColorLuma > 0.6 ? Qt.darker(theme.textColor, 1.7) : Qt.lighter(theme.textColor, 7)
}
//a small badgers record (id,value)
//in order to track badgers when there are changes

1
plasmoid/package/contents/ui/task/TaskIconItem.qml
View File

@ -495,6 +495,7 @@ Item{
Latte.BadgeText {
id: taskNumber
anchors.centerIn: parent
border.color: root.minimizedDotColor
//opacity: taskNumberLoader.opacityN && !root.enableShadows ? 1 : 0
minimumWidth: 0.4 * root.iconSize

1
plasmoid/package/contents/ui/task/TaskProgressOverlay.qml
View File

@ -58,6 +58,7 @@ Item {
Latte.BadgeText {
id: progressCircle
anchors.centerIn: parent
border.color: root.minimizedDotColor
minimumWidth: 0.8 * parent.height
height: 0.8 * parent.height
numberValue: mainItemContainer.badgeIndicator > 0 ? mainItemContainer.badgeIndicator : centralItem.smartLauncherItem.count