1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-05 21:15:38 -05:00

keybinds tab: change colors

This commit is contained in:
bbedward
2025-12-03 23:14:20 -05:00
parent d22c43e08b
commit b6847289ff
2 changed files with 12 additions and 24 deletions

View File

@@ -258,20 +258,8 @@ Item {
readonly property bool showWarning: status.included && status.overriddenBy > 0 readonly property bool showWarning: status.included && status.overriddenBy > 0
readonly property bool showSetup: !status.exists readonly property bool showSetup: !status.exists
color: { color: (showError || showWarning || showSetup) ? Theme.withAlpha(Theme.primary, 0.15) : "transparent"
if (showError || showSetup) border.color: (showError || showWarning || showSetup) ? Theme.withAlpha(Theme.primary, 0.3) : "transparent"
return Theme.withAlpha(Theme.error, 0.15);
if (showWarning)
return Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.15);
return "transparent";
}
border.color: {
if (showError || showSetup)
return Theme.withAlpha(Theme.error, 0.3);
if (showWarning)
return Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.3);
return "transparent";
}
border.width: 1 border.width: 1
visible: (showError || showWarning || showSetup) && !KeybindsService.loading visible: (showError || showWarning || showSetup) && !KeybindsService.loading
@@ -288,7 +276,7 @@ Item {
DankIcon { DankIcon {
name: warningBox.showWarning ? "info" : "warning" name: warningBox.showWarning ? "info" : "warning"
size: Theme.iconSize size: Theme.iconSize
color: warningBox.showWarning ? (Theme.warning ?? Theme.tertiary) : Theme.error color: Theme.primary
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
@@ -309,7 +297,7 @@ Item {
} }
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
font.weight: Font.Medium font.weight: Font.Medium
color: warningBox.showWarning ? (Theme.warning ?? Theme.tertiary) : Theme.error color: Theme.primary
} }
StyledText { StyledText {

View File

@@ -312,14 +312,14 @@ Item {
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 14 size: 14
color: Theme.warning ?? Theme.tertiary color: Theme.primary
visible: root.hasConfigConflict visible: root.hasConfigConflict
} }
StyledText { StyledText {
text: I18n.tr("Overridden by config") text: I18n.tr("Overridden by config")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.warning ?? Theme.tertiary color: Theme.primary
visible: root.hasConfigConflict visible: root.hasConfigConflict
} }
@@ -382,8 +382,8 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: conflictColumn.implicitHeight + Theme.spacingM * 2 Layout.preferredHeight: conflictColumn.implicitHeight + Theme.spacingM * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.15) color: Theme.withAlpha(Theme.primary, 0.15)
border.color: Theme.withAlpha(Theme.warning ?? Theme.tertiary, 0.3) border.color: Theme.withAlpha(Theme.primary, 0.3)
border.width: 1 border.width: 1
visible: root.hasConfigConflict visible: root.hasConfigConflict
@@ -400,14 +400,14 @@ Item {
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 16 size: 16
color: Theme.warning ?? Theme.tertiary color: Theme.primary
} }
StyledText { StyledText {
text: I18n.tr("This bind is overridden by config.kdl") text: I18n.tr("This bind is overridden by config.kdl")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.warning ?? Theme.tertiary color: Theme.primary
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
@@ -663,13 +663,13 @@ Item {
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 16 size: 16
color: Theme.warning color: Theme.primary
} }
StyledText { StyledText {
text: I18n.tr("Conflicts with: %1").arg(root._conflicts.map(c => c.desc).join(", ")) text: I18n.tr("Conflicts with: %1").arg(root._conflicts.map(c => c.desc).join(", "))
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.warning color: Theme.primary
Layout.fillWidth: true Layout.fillWidth: true
elide: Text.ElideRight elide: Text.ElideRight
} }