marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-30 00:04:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use theme colors for the convergence dock

Browse source 
The dock background was a hardcoded dark fill because upstream
icon labels are white (for floating over wallpaper). Switching
to Theme.backgroundColor alone just made labels vanish on light
themes, so it kept getting reverted.

Fix the whole stack at once: background uses the Window color
set, hover highlights derive from Theme.textColor instead of
white, and delegate labels switch to Theme.textColor in
convergence mode (still white over wallpaper on mobile).
This commit is contained in:
Marco Allegretti 2026-04-19 08:56:44 +02:00
parent d4da69b2f2
commit e8bb4f2483
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
containments/homescreens/folio/qml/FavouritesBar.qml
View file

@ -130,8 +130,8 @@ MouseArea {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: root.navButtonWidth width: root.navButtonWidth
color: homeMouseArea.containsPress color: homeMouseArea.containsPress
? Qt.rgba(1, 1, 1, 0.2) ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.2)
: (homeMouseArea.containsMouse ? Qt.rgba(1, 1, 1, 0.1) : "transparent") : (homeMouseArea.containsMouse ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.1) : "transparent")
radius: Kirigami.Units.cornerRadius radius: Kirigami.Units.cornerRadius
Kirigami.Icon { Kirigami.Icon {
@ -160,8 +160,8 @@ MouseArea {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
width: root.navButtonWidth width: root.navButtonWidth
color: overviewMouseArea.containsPress color: overviewMouseArea.containsPress
? Qt.rgba(1, 1, 1, 0.2) ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.2)
: (overviewMouseArea.containsMouse ? Qt.rgba(1, 1, 1, 0.1) : "transparent") : (overviewMouseArea.containsMouse ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.1) : "transparent")
radius: Kirigami.Units.cornerRadius radius: Kirigami.Units.cornerRadius
Kirigami.Icon { Kirigami.Icon {
@ -854,8 +854,8 @@ MouseArea {
anchors.fill: parent anchors.fill: parent
radius: Kirigami.Units.cornerRadius radius: Kirigami.Units.cornerRadius
color: taskMouseArea.containsPress color: taskMouseArea.containsPress
? Qt.rgba(1.0, 1.0, 1.0, 0.2) ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.2)
: (taskMouseArea.containsMouse ? Qt.rgba(1.0, 1.0, 1.0, 0.1) : "transparent") : (taskMouseArea.containsMouse ? Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.1) : "transparent")
} }
// Task icon // Task icon

4
containments/homescreens/folio/qml/delegate/AbstractDelegate.qml
View file

@ -126,7 +126,7 @@ Folio.DelegateTouchArea {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
radius: Kirigami.Units.cornerRadius radius: Kirigami.Units.cornerRadius
color: Qt.rgba(1.0, 1.0, 1.0, 0.1) color: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.1)
visible: ShellSettings.Settings.convergenceModeEnabled && root.hovered visible: ShellSettings.Settings.convergenceModeEnabled && root.hovered
} }
} }
@ -142,7 +142,7 @@ Folio.DelegateTouchArea {
Layout.rightMargin: -parent.anchors.rightMargin + Kirigami.Units.smallSpacing Layout.rightMargin: -parent.anchors.rightMargin + Kirigami.Units.smallSpacing
text: root.name text: root.name
color: "white" color: ShellSettings.Settings.convergenceModeEnabled ? Kirigami.Theme.textColor : "white"
} }
} }
} }

4
containments/homescreens/folio/qml/main.qml
View file

@ -263,7 +263,9 @@ ContainmentItem {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: Qt.rgba(0, 0, 0, 0.5) Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Window
color: Kirigami.Theme.backgroundColor
transform: Translate { y: dockOverlay.dockOffset } transform: Translate { y: dockOverlay.dockOffset }
} }