From 0e04538a7be1a37730543d1813482122d7683338 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 22 Jan 2026 00:10:11 +0100 Subject: [PATCH 1/4] make battery block use new font cause old one looks ass --- modules/bar/Battery.qml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index 13f1162..6508912 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -35,22 +35,22 @@ Loader { return "battery_android_frame_bolt"; } if (frame1) { - return "battery_1_bar"; + return "battery_android_frame_1"; } if (frame2) { - return "battery_2_bar"; + return "battery_android_frame_2"; } if (frame3) { - return "battery_3_bar"; + return "battery_android_frame_3"; } if (frame4) { - return "battery_4_bar"; + return "battery_android_frame_4"; } if (frame5) { - return "battery_5_bar"; + return "battery_android_frame_5"; } if (frame6) { - return "battery_full"; + return "battery_android_frame_full"; } } function getProfileIcon() { @@ -78,6 +78,7 @@ Loader { } CustomIcon { id: batIcon + font.family: "Material Symbols Rounded" text: root.getBatteryIcon() } Item { From 520ca3bb4c12506eae7963bc863b90d76de58a4b Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 22 Jan 2026 10:30:41 +0100 Subject: [PATCH 2/4] style wallpaperswitcher --- modules/bar/Battery.qml | 1 + modules/widgets/wallswitcher/WallSwitcher.qml | 76 +++++++++++-------- .../wallswitcher/WallSwitcherWindow.qml | 2 + 3 files changed, 47 insertions(+), 32 deletions(-) create mode 100644 modules/widgets/wallswitcher/WallSwitcherWindow.qml diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml index 6508912..a10c2ed 100644 --- a/modules/bar/Battery.qml +++ b/modules/bar/Battery.qml @@ -74,6 +74,7 @@ Loader { spacing: 5 CustomText { id: batText + anchors.verticalCenter: parent.verticalCenter text: Math.round(UPower.displayDevice.percentage * 100) + "%" } CustomIcon { diff --git a/modules/widgets/wallswitcher/WallSwitcher.qml b/modules/widgets/wallswitcher/WallSwitcher.qml index 7fc79ff..44ae0a0 100644 --- a/modules/widgets/wallswitcher/WallSwitcher.qml +++ b/modules/widgets/wallswitcher/WallSwitcher.qml @@ -8,14 +8,18 @@ import Qt.labs.folderlistmodel 2.10 import Quickshell.Io import qs import Quickshell.Hyprland +import QtQuick.Layouts FloatingWindow { id: root + implicitHeight: 600 + implicitWidth: 900 + title: "qs-wallswitcher" visible: Settings.config.wallSwitcherShown + color: Colors.background onClosed: { Settings.config.wallSwitcherShown = false; } - Process { id: wallustRunner property string cmd: "matugen image " + Settings.config.currentWall @@ -28,31 +32,51 @@ FloatingWindow { } } - implicitHeight: 600 - implicitWidth: 900 - title: "qs-wallswitcher" - color: Colors.background - WrapperItem { - id: innerWindowWrapper - anchors.centerIn: parent + ColumnLayout { + id: windowLayout anchors.fill: parent - margin: 20 - child: Rectangle { + + Rectangle { + id: textWrapper + Layout.fillWidth: true + Layout.margins: 20 + Layout.alignment: Qt.AlignCenter + radius: 14 + implicitHeight: 30 + color: Colors.color6 + CustomText { + id: titleText + anchors.centerIn: textWrapper + text: "Wallpapers in " + Settings.config.wallDir + } + } + + Rectangle { id: innerWindow - anchors.fill: parent - anchors.centerIn: parent - implicitWidth: parent.implicitWidth - implicitHeight: parent.implicitHeight + Layout.fillWidth: true + Layout.fillHeight: true + Layout.margins: 20 + radius: 14 + color: Colors.color8 GridView { id: gridRoot + property var columns: Math.floor(gridRoot.width / cellWidth) + property var usedWidth: columns * cellWidth + property var emptySpace: width - usedWidth + property var rows: Math.floor(gridRoot.height / cellHeight) + property var usedHeight: rows * cellHeight + property var emptyHeight: height - usedHeight + clip: true + boundsBehavior: Flickable.StopAtBounds + snapMode: GridView.SnapToRow cellWidth: 140 cellHeight: 100 - topMargin: innerWindowText.implicitHeight + innerWindowText.topPadding - anchors.fill: parent - anchors.horizontalCenter: parent.horizontalCenter - leftMargin: 40 - rightMargin: 20 - + anchors.fill: innerWindow + anchors.centerIn: innerWindow + leftMargin: emptySpace / 2 + anchors.margins: 20 + model: folderModel + delegate: fileDelegate FolderListModel { id: folderModel folder: Settings.config.wallDir @@ -84,18 +108,6 @@ FloatingWindow { } } } - - model: folderModel - delegate: fileDelegate - } - - radius: 24 - color: Colors.background - CustomText { - id: innerWindowText - topPadding: 10 - text: "Wallpapers in " + Settings.config.wallDir - anchors.horizontalCenter: parent.horizontalCenter } } } diff --git a/modules/widgets/wallswitcher/WallSwitcherWindow.qml b/modules/widgets/wallswitcher/WallSwitcherWindow.qml new file mode 100644 index 0000000..f4a3e50 --- /dev/null +++ b/modules/widgets/wallswitcher/WallSwitcherWindow.qml @@ -0,0 +1,2 @@ +import qs +import qs.settings From bf61bd3a0e0c03e01203faf9529e67f7046200c5 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 22 Jan 2026 10:33:57 +0100 Subject: [PATCH 3/4] change margin logic --- modules/widgets/wallswitcher/WallSwitcher.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/widgets/wallswitcher/WallSwitcher.qml b/modules/widgets/wallswitcher/WallSwitcher.qml index 44ae0a0..4e307a5 100644 --- a/modules/widgets/wallswitcher/WallSwitcher.qml +++ b/modules/widgets/wallswitcher/WallSwitcher.qml @@ -74,6 +74,7 @@ FloatingWindow { anchors.fill: innerWindow anchors.centerIn: innerWindow leftMargin: emptySpace / 2 + rightMargin: emptySpace / 2 anchors.margins: 20 model: folderModel delegate: fileDelegate From 2aea6d3a2c3a10034a932483f564a13d22cd1d57 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 22 Jan 2026 19:05:20 +0100 Subject: [PATCH 4/4] 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: ({