Rename the Color singleton to avoid the Qt 6.12 clash
This commit is contained in:
1 parent
97854006b5
commit
d92290c06c
93 files changed
+342
-342
No files matched your search
+11
-11
@@ -68,16 +68,16 @@ Item {
|
||||
// to "monospace"), so changing the system font (via `blob-font-set`)
|
||||
// updates the bar without a reload.
|
||||
property string fontFamily: Style.font.family
|
||||
// Bound to the central Color singleton so the bar tracks shell.toml's
|
||||
// Bound to the central Colors singleton so the bar tracks shell.toml's
|
||||
// [bar] section. Property names kept for the rest of this file's bindings.
|
||||
property color themeForeground: Color.bar.text
|
||||
property color themeContrastForeground: Color.background
|
||||
property color transparentForeground: Color.bar.text
|
||||
property color themeForeground: Colors.bar.text
|
||||
property color themeContrastForeground: Colors.background
|
||||
property color transparentForeground: Colors.bar.text
|
||||
property color foreground: themeForeground
|
||||
property color barForeground: useTransparentForeground ? transparentForeground : themeForeground
|
||||
property bool foregroundAnimationEnabled: true
|
||||
property color background: Color.bar.background
|
||||
property color urgent: Color.bar.active
|
||||
property color background: Colors.bar.background
|
||||
property color urgent: Colors.bar.active
|
||||
|
||||
Behavior on barForeground { enabled: root.foregroundAnimationEnabled; ColorAnimation { duration: 420; easing.type: Easing.InOutCubic } }
|
||||
Behavior on background { ColorAnimation { duration: 420; easing.type: Easing.InOutCubic } }
|
||||
@@ -1249,8 +1249,8 @@ Item {
|
||||
id: tooltipBubble
|
||||
implicitWidth: tooltipLabel.implicitWidth + 20
|
||||
implicitHeight: tooltipLabel.implicitHeight + 14
|
||||
color: Color.tooltip.background
|
||||
borderSpec: Border.surfaceSpec("tooltip", "border", Color.tooltip.border, 1)
|
||||
color: Colors.tooltip.background
|
||||
borderSpec: Border.surfaceSpec("tooltip", "border", Colors.tooltip.border, 1)
|
||||
radius: Style.cornerRadius
|
||||
|
||||
Text {
|
||||
@@ -1258,7 +1258,7 @@ Item {
|
||||
textFormat: Text.PlainText
|
||||
anchors.centerIn: parent
|
||||
text: root.tooltipText
|
||||
color: Color.tooltip.text
|
||||
color: Colors.tooltip.text
|
||||
font.family: root.fontFamily
|
||||
font.pixelSize: Style.font.body
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
@@ -1377,7 +1377,7 @@ Item {
|
||||
y: targetRect ? Math.round(targetRect.y) : 0
|
||||
width: targetRect ? targetRect.width : 0
|
||||
height: targetRect ? targetRect.height : 0
|
||||
color: Color.accent
|
||||
color: Colors.accent
|
||||
radius: Math.min(width, height) / 2
|
||||
}
|
||||
}
|
||||
@@ -1673,7 +1673,7 @@ Item {
|
||||
|
||||
visible: opacity > 0
|
||||
opacity: slot.panelOpen && !slot.dragSource ? 0.9 : 0
|
||||
color: Color.accent
|
||||
color: Colors.accent
|
||||
radius: Math.min(width, height) / 2
|
||||
width: root.vertical ? Style.space(2) : slot.panelIndicatorExtent
|
||||
height: root.vertical ? slot.panelIndicatorExtent : Style.space(2)
|
||||
|
||||
@@ -34,7 +34,7 @@ BarWidget {
|
||||
anchors.left: parent.left
|
||||
width: parent.width
|
||||
text: root.title
|
||||
color: root.bar ? root.bar.barForeground : Color.foreground
|
||||
color: root.bar ? root.bar.barForeground : Colors.foreground
|
||||
font.family: root.bar ? root.bar.fontFamily : Style.font.family
|
||||
font.pixelSize: Style.font.body
|
||||
elide: Text.ElideRight
|
||||
|
||||
@@ -16,7 +16,7 @@ BarWidget {
|
||||
property bool trayMenuOpen: false
|
||||
property var activeTrayItem: null
|
||||
property var activeTrayAnchor: null
|
||||
readonly property color foreground: bar ? bar.foreground : Color.foreground
|
||||
readonly property color foreground: bar ? bar.foreground : Colors.foreground
|
||||
readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
|
||||
readonly property var pinnedIds: settings.pinned instanceof Array ? settings.pinned : []
|
||||
readonly property var hiddenIds: settings.hidden instanceof Array ? settings.hidden : []
|
||||
@@ -617,7 +617,7 @@ BarWidget {
|
||||
anchors.rightMargin: Style.space(10)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
height: 1
|
||||
color: Color.popups.border
|
||||
color: Colors.popups.border
|
||||
opacity: 0.45
|
||||
}
|
||||
}
|
||||
@@ -671,7 +671,7 @@ BarWidget {
|
||||
anchors.rightMargin: Style.space(10)
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
height: 1
|
||||
color: Color.popups.border
|
||||
color: Colors.popups.border
|
||||
opacity: 0.45
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user