mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-18 09:05:24 -04:00
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 <bbedward@gmail.com>
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user