From 3b256aa50da9b18944a73d4c39913984f43c0911 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Fri, 22 Aug 2025 14:41:46 -0400 Subject: [PATCH 1/3] Better Bar settings layout --- Modules/SettingsPanel/Tabs/BarTab.qml | 60 ++++++++++++++------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml index c751dcb..fe162d8 100644 --- a/Modules/SettingsPanel/Tabs/BarTab.qml +++ b/Modules/SettingsPanel/Tabs/BarTab.qml @@ -33,12 +33,6 @@ ColumnLayout { spacing: Style.marginL * scaling Layout.fillWidth: true - NText { - text: "Bar & Widgets" - font.pointSize: Style.fontSizeXXL * scaling - font.weight: Style.fontWeightBold - color: Color.mOnSurface - } ColumnLayout { spacing: Style.marginXXS * scaling @@ -78,25 +72,7 @@ ColumnLayout { } } - NToggle { - label: "Show Active Window's Icon" - description: "Display the app icon next to the title of the currently focused window." - checked: Settings.data.bar.showActiveWindowIcon - onToggled: checked => { - Settings.data.bar.showActiveWindowIcon = checked - } - } - - NToggle { - label: "Show Battery Percentage" - description: "Show battery percentage at all times." - checked: Settings.data.bar.alwaysShowBatteryPercentage - onToggled: checked => { - Settings.data.bar.alwaysShowBatteryPercentage = checked - } - } - - ColumnLayout { + ColumnLayout { spacing: Style.marginXXS * scaling Layout.fillWidth: true @@ -135,20 +111,46 @@ ColumnLayout { } } - // Widget Management Section + + NToggle { + label: "Show Active Window's Icon" + description: "Display the app icon next to the title of the currently focused window." + checked: Settings.data.bar.showActiveWindowIcon + onToggled: checked => { + Settings.data.bar.showActiveWindowIcon = checked + } + } + + NToggle { + label: "Show Battery Percentage" + description: "Show battery percentage at all times." + checked: Settings.data.bar.alwaysShowBatteryPercentage + onToggled: checked => { + Settings.data.bar.alwaysShowBatteryPercentage = checked + } + } + + + NDivider { + Layout.fillWidth: true + Layout.topMargin: Style.marginL * scaling + Layout.bottomMargin: Style.marginL * scaling + } + + // Widgets Management Section ColumnLayout { spacing: Style.marginXXS * scaling Layout.fillWidth: true NText { - text: "Widget Management" + text: "Widgets Positioning" font.pointSize: Style.fontSizeL * scaling font.weight: Style.fontWeightBold color: Color.mOnSurface } NText { - text: "Configure which widgets appear in each section of the bar. Use the arrow buttons to reorder widgets, or the add/remove buttons to manage them." + text: "Add, remove, or reorder widgets in each section of the bar using the control buttons." font.pointSize: Style.fontSizeXS * scaling color: Color.mOnSurfaceVariant wrapMode: Text.WordWrap @@ -159,6 +161,7 @@ ColumnLayout { ColumnLayout { Layout.fillWidth: true Layout.fillHeight: true + Layout.topMargin: Style.marginM * scaling spacing: Style.marginM * scaling // Left Section @@ -206,6 +209,7 @@ ColumnLayout { placeholder: "Add widget to left section" onSelected: key => { addWidgetToSection(key, "left") + reset() // Reset selection } } } From 5994bd7929c2e96a451982409a97acca937dfc8f Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Fri, 22 Aug 2025 14:50:14 -0400 Subject: [PATCH 2/3] Fixed warnings due to delete settings --- Commons/Settings.qml | 2 -- Modules/Bar/Widgets/ActiveWindow.qml | 2 +- Modules/Bar/Widgets/NotificationHistory.qml | 1 - Modules/Bar/Widgets/SystemMonitor.qml | 1 - Modules/Bar/Widgets/Tray.qml | 4 +--- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Commons/Settings.qml b/Commons/Settings.qml index dcb664a..6797201 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -121,14 +121,12 @@ Singleton { bar: JsonObject { property string position: "top" // Possible values: "top", "bottom" property bool showActiveWindowIcon: true - property bool alwaysShowBatteryPercentage: false property real backgroundOpacity: 1.0 property list monitors: [] // Widget configuration for modular bar system property JsonObject widgets - widgets: JsonObject { property list left: ["SystemMonitor", "ActiveWindow", "MediaMini"] property list center: ["Workspace"] diff --git a/Modules/Bar/Widgets/ActiveWindow.qml b/Modules/Bar/Widgets/ActiveWindow.qml index ec7b42b..25af960 100644 --- a/Modules/Bar/Widgets/ActiveWindow.qml +++ b/Modules/Bar/Widgets/ActiveWindow.qml @@ -11,7 +11,7 @@ Row { id: root anchors.verticalCenter: parent.verticalCenter spacing: Style.marginS * scaling - visible: (Settings.data.bar.showActiveWindow && getTitle() !== "") + visible: getTitle() !== "" property bool showingFullTitle: false property int lastWindowIndex: -1 diff --git a/Modules/Bar/Widgets/NotificationHistory.qml b/Modules/Bar/Widgets/NotificationHistory.qml index ba794b4..8cf0502 100644 --- a/Modules/Bar/Widgets/NotificationHistory.qml +++ b/Modules/Bar/Widgets/NotificationHistory.qml @@ -10,7 +10,6 @@ import qs.Widgets NIconButton { id: root - visible: Settings.data.bar.showNotificationsHistory sizeMultiplier: 0.8 icon: "notifications" tooltipText: "Notification History" diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml index 860adf3..18bb8b6 100644 --- a/Modules/Bar/Widgets/SystemMonitor.qml +++ b/Modules/Bar/Widgets/SystemMonitor.qml @@ -8,7 +8,6 @@ Row { id: root anchors.verticalCenter: parent.verticalCenter spacing: Style.marginS * scaling - visible: (Settings.data.bar.showSystemInfo) Rectangle { // Let the Rectangle size itself based on its content (the Row) diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml index d85a174..553e56b 100644 --- a/Modules/Bar/Widgets/Tray.qml +++ b/Modules/Bar/Widgets/Tray.qml @@ -12,10 +12,8 @@ import qs.Widgets Rectangle { readonly property real itemSize: 24 * scaling - visible: Settings.data.bar.showTray && (SystemTray.items.values.length > 0) - + visible: SystemTray.items.values.length > 0 width: tray.width + Style.marginM * scaling * 2 - height: Math.round(Style.capsuleHeight * scaling) radius: Math.round(Style.radiusM * scaling) color: Color.mSurfaceVariant From b48e2422fa54c019bcd6da6dd494606fba6c1126 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Fri, 22 Aug 2025 14:50:20 -0400 Subject: [PATCH 3/3] Rosepine update --- Assets/ColorScheme/Rosepine.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ColorScheme/Rosepine.json b/Assets/ColorScheme/Rosepine.json index 891b544..37e9b3a 100644 --- a/Assets/ColorScheme/Rosepine.json +++ b/Assets/ColorScheme/Rosepine.json @@ -1,19 +1,19 @@ { "dark": { "mPrimary": "#ebbcba", - "mOnPrimary": "#191724", + "mOnPrimary": "#1f1d2e", "mSecondary": "#9ccfd8", - "mOnSecondary": "#191724", + "mOnSecondary": "#1f1d2e", "mTertiary": "#f6c177", - "mOnTertiary": "#191724", + "mOnTertiary": "#1f1d2e", "mError": "#eb6f92", "mOnError": "#1f1d2e", - "mSurface": "#191724", + "mSurface": "#1f1d2e", "mOnSurface": "#e0def4", "mSurfaceVariant": "#26233a", "mOnSurfaceVariant": "#908caa", "mOutline": "#403d52", - "mShadow": "#191724" + "mShadow": "#1f1d2e" }, "light": { "mPrimary": "#d46e6b",