diff --git a/modules/BarIcon.qml b/modules/BarIcon.qml index 3761453..4ea736d 100644 --- a/modules/BarIcon.qml +++ b/modules/BarIcon.qml @@ -7,7 +7,6 @@ Text { property string icon: "" property string tooltip: "" property string minIcon: "" - property color accentColor: parent?.accentColor ?? M.Theme.base05 property bool _hovered: false property string _displayIcon: icon property string _pendingIcon: "" @@ -42,7 +41,7 @@ Text { } width: minIcon ? Math.max(implicitWidth, _minIconMetrics.width) : implicitWidth horizontalAlignment: minIcon ? Text.AlignHCenter : Text.AlignLeft - color: root.accentColor + color: parent?.accentColor ?? M.Theme.base05 font.pixelSize: M.Theme.fontSize + 1 font.family: M.Theme.iconFontFamily verticalAlignment: Text.AlignVCenter @@ -61,7 +60,7 @@ Text { M.FlyoutState.text = root.tooltip; M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0); M.FlyoutState.screen = QsWindow.window?.screen ?? null; - M.FlyoutState.accentColor = root.accentColor; + M.FlyoutState.accentColor = parent?.accentColor ?? root.color; M.FlyoutState.visible = true; } else if (!hovered && root.tooltip !== "") { M.FlyoutState.visible = false; diff --git a/modules/BarLabel.qml b/modules/BarLabel.qml index 50dba29..5d8ff03 100644 --- a/modules/BarLabel.qml +++ b/modules/BarLabel.qml @@ -7,13 +7,12 @@ Text { property string label: "" property string tooltip: "" property string minText: "" - property color accentColor: parent?.accentColor ?? M.Theme.base05 property bool _hovered: false text: label width: minText ? Math.max(implicitWidth, _minMetrics.width) : implicitWidth horizontalAlignment: minText ? Text.AlignHCenter : Text.AlignLeft - color: root.accentColor + color: parent?.accentColor ?? M.Theme.base05 font.pixelSize: M.Theme.fontSize font.family: M.Theme.fontFamily verticalAlignment: Text.AlignVCenter @@ -32,7 +31,7 @@ Text { M.FlyoutState.text = root.tooltip; M.FlyoutState.itemX = root.mapToGlobal(root.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0); M.FlyoutState.screen = QsWindow.window?.screen ?? null; - M.FlyoutState.accentColor = root.accentColor; + M.FlyoutState.accentColor = parent?.accentColor ?? root.color; M.FlyoutState.visible = true; } else if (!hovered && root.tooltip !== "") { M.FlyoutState.visible = false; diff --git a/modules/IdleInhibitor.qml b/modules/IdleInhibitor.qml index 8abc880..2bb4104 100644 --- a/modules/IdleInhibitor.qml +++ b/modules/IdleInhibitor.qml @@ -5,7 +5,7 @@ import "." as M M.BarIcon { id: root - color: root.active ? M.Theme.base09 : root.accentColor + color: root.active ? M.Theme.base09 : (parent?.accentColor ?? M.Theme.base05) tooltip: { const parts = ["Idle inhibition: " + (root.active ? "active" : "inactive")]; if (root._inhibitors) diff --git a/modules/PowerProfile.qml b/modules/PowerProfile.qml index cb6fead..f7af01a 100644 --- a/modules/PowerProfile.qml +++ b/modules/PowerProfile.qml @@ -5,7 +5,7 @@ M.BarIcon { id: root tooltip: "Power profile: " + (M.PowerProfileService.profile || "unknown") - color: M.PowerProfileService.profile === "performance" ? M.Theme.base09 : M.PowerProfileService.profile === "power-saver" ? M.Theme.base0B : root.accentColor + color: M.PowerProfileService.profile === "performance" ? M.Theme.base09 : M.PowerProfileService.profile === "power-saver" ? M.Theme.base0B : parent?.accentColor ?? M.Theme.base05 icon: { if (M.PowerProfileService.profile === "performance") diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml index e377e89..b4fdae5 100644 --- a/modules/lock/LockSurface.qml +++ b/modules/lock/LockSurface.qml @@ -10,7 +10,7 @@ WlSessionLockSurface { required property WlSessionLock lock required property LockAuth auth - color: M.Theme.base00 + color: "transparent" // Blur screenshot of desktop as background ScreencopyView {