diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-05-05 14:50:18 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-05-05 14:50:18 +1000 |
| commit | 1fdaf24526ae688251307f2756bcdb9d7592e383 (patch) | |
| tree | 9187b1efd11bfa7d1d2625da29c308a6a51c2842 /modules/bar/components/workspaces | |
| parent | dev: get rid of wrapper width/height = 0 warnings (diff) | |
| download | caelestia-shell-1fdaf24526ae688251307f2756bcdb9d7592e383.tar.gz caelestia-shell-1fdaf24526ae688251307f2756bcdb9d7592e383.tar.bz2 caelestia-shell-1fdaf24526ae688251307f2756bcdb9d7592e383.zip | |
refactor: move colours to separate service
Diffstat (limited to 'modules/bar/components/workspaces')
4 files changed, 6 insertions, 5 deletions
diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml index 2d43f19..a9d3e60 100644 --- a/modules/bar/components/workspaces/ActiveIndicator.qml +++ b/modules/bar/components/workspaces/ActiveIndicator.qml @@ -33,7 +33,7 @@ Rectangle { visible: false anchors.fill: parent - color: Appearance.on(root.color) + color: Colours.on(root.color) Behavior on color { ColorAnimation { diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml index ccbc75f..ae9c333 100644 --- a/modules/bar/components/workspaces/OccupiedBg.qml +++ b/modules/bar/components/workspaces/OccupiedBg.qml @@ -1,6 +1,7 @@ pragma ComponentBehavior: Bound import "root:/widgets" +import "root:/services" import "root:/config" import Quickshell import QtQuick @@ -51,7 +52,7 @@ Item { readonly property Workspace start: root.workspaces[modelData.start - 1 - root.groupOffset] ?? null readonly property Workspace end: root.workspaces[modelData.end - 1 - root.groupOffset] ?? null - color: Appearance.alpha(Appearance.colours.m3surfaceContainerHigh, true) + color: Colours.alpha(Colours.palette.m3surfaceContainerHigh, true) radius: BarConfig.workspaces.rounded ? Appearance.rounding.full : 0 x: start?.x ?? 0 diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml index 9edc8e4..7f4bc68 100644 --- a/modules/bar/components/workspaces/Workspace.qml +++ b/modules/bar/components/workspaces/Workspace.qml @@ -34,7 +34,7 @@ Item { animate: true text: Hyprland.activeWsId === root.ws ? activeLabel : root.isOccupied ? occupiedLabel : label - color: BarConfig.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Appearance.colours.m3onSurface : Appearance.colours.m3outlineVariant + color: BarConfig.workspaces.occupiedBg || root.isOccupied || Hyprland.activeWsId === root.ws ? Colours.palette.m3onSurface : Colours.palette.m3outlineVariant horizontalAlignment: StyledText.AlignHCenter verticalAlignment: StyledText.AlignVCenter @@ -63,7 +63,7 @@ Item { required property Hyprland.Client modelData text: Icons.getAppCategoryIcon(modelData.wmClass, "terminal") - color: Appearance.colours.m3onSurfaceVariant + color: Colours.palette.m3onSurfaceVariant } } } diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml index b2def7e..738f679 100644 --- a/modules/bar/components/workspaces/Workspaces.qml +++ b/modules/bar/components/workspaces/Workspaces.qml @@ -9,7 +9,7 @@ Item { id: root property alias vertical: layout.vertical - property color colour: Appearance.colours.mauve + property color colour: Colours.palette.mauve readonly property list<Workspace> workspaces: layout.children.filter(c => c.isWorkspace).sort((w1, w2) => w1.ws - w2.ws) readonly property var occupied: Hyprland.workspaces.values.reduce((acc, curr) => { |