From 7af530de8f3e42593c7af91f71762d4856aa4ac4 Mon Sep 17 00:00:00 2001 From: Jonas Bloch <128738169+Silzinc@users.noreply.github.com> Date: Thu, 18 Jun 2026 03:58:11 +0200 Subject: [PATCH] fix(ui): use primaryText instead of primary for text and icons displayed on primaryContainer background in the launcher (#2586) * fix(ui): use primaryText instead of primary for text and icons displayed on primaryContainer background in the launcher * fix(ui): use onPrimaryContainer instead of primaryText on primaryContainer background * launcher pills: switch to buttonBg buttonText --------- Co-authored-by: bbedward --- quickshell/Modals/DankLauncherV2/LauncherContent.qml | 12 ++++++------ quickshell/Widgets/DankIcon.qml | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/quickshell/Modals/DankLauncherV2/LauncherContent.qml b/quickshell/Modals/DankLauncherV2/LauncherContent.qml index 890f4fef..588415c2 100644 --- a/quickshell/Modals/DankLauncherV2/LauncherContent.qml +++ b/quickshell/Modals/DankLauncherV2/LauncherContent.qml @@ -363,7 +363,7 @@ FocusScope { width: buttonContent.width + Theme.spacingM * 2 height: 28 radius: Theme.cornerRadius - color: controller.searchMode === modelData.id || modeArea.containsMouse ? Theme.primaryContainer : "transparent" + color: controller.searchMode === modelData.id ? Theme.buttonBg : modeArea.containsMouse ? Theme.surfaceContainerHighest : "transparent" Row { id: buttonContent @@ -374,14 +374,14 @@ FocusScope { anchors.verticalCenter: parent.verticalCenter name: modelData.icon size: 14 - color: controller.searchMode === modelData.id ? Theme.primary : Theme.surfaceVariantText + color: controller.searchMode === modelData.id ? Theme.buttonText : Theme.surfaceVariantText } StyledText { anchors.verticalCenter: parent.verticalCenter text: modelData.label font.pixelSize: Theme.fontSizeSmall - color: controller.searchMode === modelData.id ? Theme.primary : Theme.surfaceText + color: controller.searchMode === modelData.id ? Theme.buttonText : Theme.surfaceText } } @@ -636,7 +636,7 @@ FocusScope { width: chipContent.width + Theme.spacingM * 2 height: sortDropdown.height radius: Theme.cornerRadius - color: controller.fileSearchType === modelData.id || chipArea.containsMouse ? Theme.primaryContainer : "transparent" + color: controller.fileSearchType === modelData.id ? Theme.buttonBg : chipArea.containsMouse ? Theme.surfaceContainerHighest : "transparent" Row { id: chipContent @@ -647,14 +647,14 @@ FocusScope { anchors.verticalCenter: parent.verticalCenter name: modelData.icon size: 14 - color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceVariantText + color: controller.fileSearchType === modelData.id ? Theme.buttonText : Theme.surfaceVariantText } StyledText { anchors.verticalCenter: parent.verticalCenter text: modelData.label font.pixelSize: Theme.fontSizeSmall - color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceText + color: controller.fileSearchType === modelData.id ? Theme.buttonText : Theme.surfaceVariantText } } diff --git a/quickshell/Widgets/DankIcon.qml b/quickshell/Widgets/DankIcon.qml index ef0676f3..b76596db 100644 --- a/quickshell/Widgets/DankIcon.qml +++ b/quickshell/Widgets/DankIcon.qml @@ -37,13 +37,6 @@ Item { horizontalAlignment: Text.AlignHCenter renderType: root.smoothTransform ? Text.QtRendering : Text.NativeRendering - Behavior on color { - enabled: Theme.currentAnimationSpeed !== SettingsData.AnimationSpeed.None - DankColorAnim { - duration: Theme.shorterDuration - easing.bezierCurve: Theme.expressiveCurves.standard - } - } font.variableAxes: { "FILL": root.fill.toFixed(1), "GRAD": root.grade,