From 2aea6d3a2c3a10034a932483f564a13d22cd1d57 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 22 Jan 2026 19:05:20 +0100 Subject: [PATCH] switch to material you colors entirely --- modules/bar/Bar.qml | 2 +- modules/bar/Battery.qml | 2 +- modules/bar/Workspaces.qml | 2 +- modules/widgets/wallswitcher/WallSwitcher.qml | 7 +++++-- reusables/CustomIcon.qml | 2 +- reusables/CustomText.qml | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml index f5460ff..bd19260 100644 --- a/modules/bar/Bar.qml +++ b/modules/bar/Bar.qml @@ -29,7 +29,7 @@ Variants { id: container implicitHeight: Settings.config.barHeight anchors.fill: parent - color: Colors.background + color: Colors.surface radius: implicitHeight / 2 Row { diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index a10c2ed..7004ad3 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -97,7 +97,7 @@ Loader { ColorOverlay { anchors.fill: parent source: rawProfileIcon - color: Colors.foreground + color: Colors.onSurfaceColor } } } diff --git a/modules/bar/Workspaces.qml b/modules/bar/Workspaces.qml index 107a25a..826c741 100644 --- a/modules/bar/Workspaces.qml +++ b/modules/bar/Workspaces.qml @@ -43,7 +43,7 @@ Item { CustomText { anchors.centerIn: workspaceNumber text: parent.modelData.id - color: Colors.color2 // Set contrasting color for workspace number + color: Colors.primary // Set contrasting color for workspace number opacity: workspaceNumber.modelData.focused ? 1 : 0.5 } MouseArea { diff --git a/modules/widgets/wallswitcher/WallSwitcher.qml b/modules/widgets/wallswitcher/WallSwitcher.qml index 4e307a5..d1b6a9f 100644 --- a/modules/widgets/wallswitcher/WallSwitcher.qml +++ b/modules/widgets/wallswitcher/WallSwitcher.qml @@ -34,13 +34,15 @@ FloatingWindow { ColumnLayout { id: windowLayout + spacing: 10 anchors.fill: parent Rectangle { id: textWrapper Layout.fillWidth: true - Layout.margins: 20 + Layout.margins: 10 Layout.alignment: Qt.AlignCenter + Layout.bottomMargin: 0 radius: 14 implicitHeight: 30 color: Colors.color6 @@ -53,9 +55,10 @@ FloatingWindow { Rectangle { id: innerWindow + Layout.topMargin: 0 Layout.fillWidth: true Layout.fillHeight: true - Layout.margins: 20 + Layout.margins: 10 radius: 14 color: Colors.color8 GridView { diff --git a/reusables/CustomIcon.qml b/reusables/CustomIcon.qml index 6520791..15b99b0 100644 --- a/reusables/CustomIcon.qml +++ b/reusables/CustomIcon.qml @@ -6,7 +6,7 @@ Text { property real fill: 1 anchors.verticalCenter: parent.verticalCenter font.family: "Material Icons Sharp" - color: Colors.foreground + color: Colors.onSurfaceColor font.variableAxes: ({ FILL: fill.toFixed(1), GRAD: -25, diff --git a/reusables/CustomText.qml b/reusables/CustomText.qml index 21427d2..7a30e61 100644 --- a/reusables/CustomText.qml +++ b/reusables/CustomText.qml @@ -3,7 +3,7 @@ import qs import qs.settings Text { - color: Colors.foreground + color: Colors.onSurfaceColor font.family: Settings.config.font font.pixelSize: Settings.config.fontSize font.variableAxes: ({