From 6a1631023e8cb28c1a7910bb32fd91ee1b06bf08 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Sat, 18 Apr 2026 20:25:26 +0200 Subject: [PATCH] Theme-aware status bar hover and remove dead nav panel code Use Kirigami.Theme.textColor for the status bar hover overlay so it works on both light and dark themes instead of hardcoded white. Remove convergence-mode branches from the navigation panel left action since it is hidden in convergence mode and the code paths were unreachable. --- components/mobileshell/qml/statusbar/StatusBar.qml | 2 +- .../taskpanel/qml/NavigationPanelComponent.qml | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index 8b5d4e3f..f504301e 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -92,7 +92,7 @@ Item { // Hover highlight in convergence mode to indicate the bar is clickable Rectangle { anchors.fill: parent - 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 && statusBarHover.hovered } diff --git a/containments/taskpanel/qml/NavigationPanelComponent.qml b/containments/taskpanel/qml/NavigationPanelComponent.qml index 492e976d..250ff76c 100644 --- a/containments/taskpanel/qml/NavigationPanelComponent.qml +++ b/containments/taskpanel/qml/NavigationPanelComponent.qml @@ -75,20 +75,16 @@ MobileShell.NavigationPanel { // ~~~~ // navigation panel actions - // toggle task switcher button (KWin Overview in convergence mode, mobile task switcher otherwise) + // toggle task switcher button leftAction: MobileShell.NavigationPanelAction { id: taskSwitcherAction enabled: true - iconSource: ShellSettings.Settings.convergenceModeEnabled ? "view-grid-symbolic" : "mobile-task-switcher" - shrinkSize: ShellSettings.Settings.convergenceModeEnabled ? 0 : 4 + iconSource: "mobile-task-switcher" + shrinkSize: 4 onTriggered: { - if (ShellSettings.Settings.convergenceModeEnabled) { - Plasmoid.triggerOverview(); - } else { - Plasmoid.triggerTaskSwitcher(); - } + Plasmoid.triggerTaskSwitcher(); } }