From df3a56f9f47e90b1995aedd6420c9ddfb1c62963 Mon Sep 17 00:00:00 2001 From: purian23 Date: Sat, 12 Jul 2025 03:29:03 -0400 Subject: [PATCH] UX update to widget padding heights, updated workspaces --- {scripts => Scripts}/README-dynamic-theme.md | 0 {scripts => Scripts}/set-wallpaper.sh | 0 Widgets/BatteryWidget.qml | 2 +- Widgets/CpuMonitorWidget.qml | 2 +- Widgets/PowerButton.qml | 2 +- Widgets/RamMonitorWidget.qml | 2 +- Widgets/TopBar/ClockWidget.qml | 2 +- Widgets/TopBar/ControlCenterButton.qml | 2 +- Widgets/TopBar/LauncherButton.qml | 2 +- Widgets/TopBar/NotificationCenterButton.qml | 2 +- Widgets/TopBar/SystemTrayWidget.qml | 2 +- Widgets/TopBar/TopBar.qml | 2 +- Widgets/TopBar/WorkspaceSwitcher.qml | 8 ++++---- 13 files changed, 14 insertions(+), 14 deletions(-) rename {scripts => Scripts}/README-dynamic-theme.md (100%) rename {scripts => Scripts}/set-wallpaper.sh (100%) diff --git a/scripts/README-dynamic-theme.md b/Scripts/README-dynamic-theme.md similarity index 100% rename from scripts/README-dynamic-theme.md rename to Scripts/README-dynamic-theme.md diff --git a/scripts/set-wallpaper.sh b/Scripts/set-wallpaper.sh similarity index 100% rename from scripts/set-wallpaper.sh rename to Scripts/set-wallpaper.sh diff --git a/Widgets/BatteryWidget.qml b/Widgets/BatteryWidget.qml index 92b70dff..3749ea97 100644 --- a/Widgets/BatteryWidget.qml +++ b/Widgets/BatteryWidget.qml @@ -9,7 +9,7 @@ Rectangle { property bool batteryPopupVisible: false width: 70 // Increased width to accommodate percentage text - height: 32 + height: 30 radius: Theme.cornerRadius color: batteryArea.containsMouse || batteryPopupVisible ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : diff --git a/Widgets/CpuMonitorWidget.qml b/Widgets/CpuMonitorWidget.qml index f893a31e..db210460 100644 --- a/Widgets/CpuMonitorWidget.qml +++ b/Widgets/CpuMonitorWidget.qml @@ -10,7 +10,7 @@ Rectangle { property bool showIcon: true width: 55 - height: 32 + height: 30 radius: Theme.cornerRadius color: cpuArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : diff --git a/Widgets/PowerButton.qml b/Widgets/PowerButton.qml index a2af331a..423b94c2 100644 --- a/Widgets/PowerButton.qml +++ b/Widgets/PowerButton.qml @@ -6,7 +6,7 @@ Rectangle { id: powerButton width: 48 - height: 32 + height: 30 radius: Theme.cornerRadius color: powerArea.containsMouse || root.powerMenuVisible ? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.16) : diff --git a/Widgets/RamMonitorWidget.qml b/Widgets/RamMonitorWidget.qml index e71225ee..2806c437 100644 --- a/Widgets/RamMonitorWidget.qml +++ b/Widgets/RamMonitorWidget.qml @@ -10,7 +10,7 @@ Rectangle { property bool showIcon: true width: 55 - height: 32 + height: 30 radius: Theme.cornerRadius color: ramArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : diff --git a/Widgets/TopBar/ClockWidget.qml b/Widgets/TopBar/ClockWidget.qml index 87a71414..dd38f215 100644 --- a/Widgets/TopBar/ClockWidget.qml +++ b/Widgets/TopBar/ClockWidget.qml @@ -28,7 +28,7 @@ Rectangle { return Math.min(baseWidth, parent.width - Theme.spacingL * 2) } } - height: 32 + height: 30 radius: Theme.cornerRadius color: clockMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : diff --git a/Widgets/TopBar/ControlCenterButton.qml b/Widgets/TopBar/ControlCenterButton.qml index 2e95c260..bcfbf506 100644 --- a/Widgets/TopBar/ControlCenterButton.qml +++ b/Widgets/TopBar/ControlCenterButton.qml @@ -15,7 +15,7 @@ Rectangle { signal clicked() width: Math.max(80, controlIndicators.implicitWidth + Theme.spacingS * 2) - height: 32 + height: 30 radius: Theme.cornerRadius color: controlCenterArea.containsMouse || root.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : diff --git a/Widgets/TopBar/LauncherButton.qml b/Widgets/TopBar/LauncherButton.qml index 19a3216c..357b41bd 100644 --- a/Widgets/TopBar/LauncherButton.qml +++ b/Widgets/TopBar/LauncherButton.qml @@ -6,7 +6,7 @@ Rectangle { id: root width: 40 - height: 32 + height: 30 radius: Theme.cornerRadius color: launcherArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) diff --git a/Widgets/TopBar/NotificationCenterButton.qml b/Widgets/TopBar/NotificationCenterButton.qml index c171e3d6..d4a9357e 100644 --- a/Widgets/TopBar/NotificationCenterButton.qml +++ b/Widgets/TopBar/NotificationCenterButton.qml @@ -9,7 +9,7 @@ Rectangle { signal clicked() width: 40 - height: 32 + height: 30 radius: Theme.cornerRadius color: notificationArea.containsMouse || root.isActive ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) : diff --git a/Widgets/TopBar/SystemTrayWidget.qml b/Widgets/TopBar/SystemTrayWidget.qml index 60b02c15..9316b10c 100644 --- a/Widgets/TopBar/SystemTrayWidget.qml +++ b/Widgets/TopBar/SystemTrayWidget.qml @@ -8,7 +8,7 @@ Rectangle { signal menuRequested(var menu, var item, real x, real y) width: Math.max(40, systemTrayRow.implicitWidth + Theme.spacingS * 2) - height: 32 + height: 30 radius: Theme.cornerRadius color: Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08) visible: systemTrayRow.children.length > 0 diff --git a/Widgets/TopBar/TopBar.qml b/Widgets/TopBar/TopBar.qml index f44541b9..3ea4ae20 100644 --- a/Widgets/TopBar/TopBar.qml +++ b/Widgets/TopBar/TopBar.qml @@ -208,7 +208,7 @@ PanelWindow { Rectangle { width: 40 - height: 32 + height: 30 radius: Theme.cornerRadius color: clipboardArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08) anchors.verticalCenter: parent.verticalCenter diff --git a/Widgets/TopBar/WorkspaceSwitcher.qml b/Widgets/TopBar/WorkspaceSwitcher.qml index 74269abe..ffad4ada 100644 --- a/Widgets/TopBar/WorkspaceSwitcher.qml +++ b/Widgets/TopBar/WorkspaceSwitcher.qml @@ -9,9 +9,9 @@ Rectangle { property string screenName: "" width: Math.max(120, workspaceRow.implicitWidth + Theme.spacingL * 2) - height: 32 + height: 30 radius: Theme.cornerRadiusLarge - color: Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, 0.8) + color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08) visible: NiriWorkspaceService.niriAvailable property int currentWorkspace: getDisplayActiveWorkspace() @@ -86,8 +86,8 @@ Rectangle { property bool isHovered: mouseArea.containsMouse property int sequentialNumber: index + 1 - width: isActive ? Theme.spacingXL + Theme.spacingS : Theme.spacingL - height: Theme.spacingS + width: isActive ? Theme.spacingXL + Theme.spacingM : Theme.spacingL + Theme.spacingXS + height: Theme.spacingM radius: height / 2 color: isActive ? Theme.primary : isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5) :