Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-23 11:35:25 -04:00
Code Packages Releases Activity

fix(ui): use primaryText instead of primary for text and icons displayed on primaryContainer background in the launcher (#2586)

Browse Source 
* 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 <bbedward@gmail.com>
This commit is contained in:
Jonas Bloch
2026-06-18 03:58:11 +02:00
committed by GitHub
parent 9a4cff4e49
commit 7af530de8f
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modals/DankLauncherV2/LauncherContent.qml
+6 -6
View File
@@ -363,7 +363,7 @@ FocusScope {
width: buttonContent.width + Theme.spacingM * 2 width: buttonContent.width + Theme.spacingM * 2
height: 28 height: 28
radius: Theme.cornerRadius 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 { Row {
id: buttonContent id: buttonContent
@@ -374,14 +374,14 @@ FocusScope {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
name: modelData.icon name: modelData.icon
size: 14 size: 14
color: controller.searchMode === modelData.id ? Theme.primary : Theme.surfaceVariantText color: controller.searchMode === modelData.id ? Theme.buttonText : Theme.surfaceVariantText
} }
StyledText { StyledText {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: modelData.label text: modelData.label
font.pixelSize: Theme.fontSizeSmall 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 width: chipContent.width + Theme.spacingM * 2
height: sortDropdown.height height: sortDropdown.height
radius: Theme.cornerRadius 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 { Row {
id: chipContent id: chipContent
@@ -647,14 +647,14 @@ FocusScope {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
name: modelData.icon name: modelData.icon
size: 14 size: 14
color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceVariantText color: controller.fileSearchType === modelData.id ? Theme.buttonText : Theme.surfaceVariantText
} }
StyledText { StyledText {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: modelData.label text: modelData.label
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: controller.fileSearchType === modelData.id ? Theme.primary : Theme.surfaceText color: controller.fileSearchType === modelData.id ? Theme.buttonText : Theme.surfaceVariantText
} }
} }
quickshell/Widgets/DankIcon.qml
-7
View File
@@ -37,13 +37,6 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
renderType: root.smoothTransform ? Text.QtRendering : Text.NativeRendering 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: { font.variableAxes: {
"FILL": root.fill.toFixed(1), "FILL": root.fill.toFixed(1),
"GRAD": root.grade, "GRAD": root.grade,