mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-29 07:52:50 -05:00
Tweak colors a bit
This commit is contained in:
@@ -80,7 +80,7 @@ Flow {
|
||||
width: Math.max(contentItem.implicitWidth + root.buttonPadding * 2, root.minButtonWidth) + (selected ? 4 : 0)
|
||||
height: root.buttonHeight
|
||||
|
||||
color: selected ? Theme.primaryContainer : Theme.primary
|
||||
color: selected ? Theme.primary : Theme.surfaceVariant
|
||||
border.color: "transparent"
|
||||
border.width: 0
|
||||
|
||||
@@ -139,8 +139,8 @@ Flow {
|
||||
topRightRadius: parent.topRightRadius
|
||||
bottomRightRadius: parent.bottomRightRadius
|
||||
color: {
|
||||
if (pressed) return selected ? Theme.primaryPressed : Theme.surfacePressed
|
||||
if (hovered) return selected ? Theme.primaryHover : Theme.surfaceHover
|
||||
if (pressed) return selected ? Theme.primaryPressed : Theme.surfaceTextHover
|
||||
if (hovered) return selected ? Theme.primaryHover : Theme.surfaceTextHover
|
||||
return "transparent"
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ Flow {
|
||||
id: checkIcon
|
||||
name: "check"
|
||||
size: root.checkIconSize
|
||||
color: segment.selected ? Theme.surfaceText : Theme.primaryText
|
||||
color: segment.selected ? Theme.primaryText : Theme.surfaceVariantText
|
||||
visible: root.checkEnabled && segment.selected
|
||||
opacity: segment.selected ? 1 : 0
|
||||
scale: segment.selected ? 1 : 0.6
|
||||
@@ -192,7 +192,7 @@ Flow {
|
||||
text: typeof modelData === "string" ? modelData : modelData.text || ""
|
||||
font.pixelSize: root.textSize
|
||||
font.weight: segment.selected ? Font.Medium : Font.Normal
|
||||
color: segment.selected ? Theme.surfaceText : Theme.primaryText
|
||||
color: segment.selected ? Theme.primaryText : Theme.surfaceVariantText
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,11 +107,14 @@ PanelWindow {
|
||||
return Math.max(Theme.popupDistance, Math.min(screenHeight - popupHeight - Theme.popupDistance, triggerY + Theme.popupDistance))
|
||||
}
|
||||
}
|
||||
|
||||
width: popupWidth
|
||||
height: popupHeight
|
||||
x: Math.round(calculatedX)
|
||||
y: Math.round(calculatedY)
|
||||
|
||||
readonly property real dpr: root.screen.devicePixelRatio
|
||||
function snap(v) { return Math.round(v * dpr) / dpr }
|
||||
width: snap(popupWidth)
|
||||
height: snap(popupHeight)
|
||||
x: snap(calculatedX)
|
||||
y: snap(calculatedY)
|
||||
|
||||
opacity: shouldBeVisible ? 1 : 0
|
||||
scale: 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user