From 56d87ecfcf0dc8dbe4195d6193b5fa9992d90679 Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Tue, 9 Sep 2025 01:02:53 -0400 Subject: [PATCH] Polishing - Volume: better spread/usage of the 3 icons - Rosepine colors: more contrast to compare to matugen - NPill: different look when pile is always opened --- Assets/ColorScheme/Rosepine.json | 12 ++++++------ Modules/Bar/Widgets/Volume.qml | 2 +- Widgets/NPill.qml | 4 +--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Assets/ColorScheme/Rosepine.json b/Assets/ColorScheme/Rosepine.json index 37e9b3a..547bb73 100644 --- a/Assets/ColorScheme/Rosepine.json +++ b/Assets/ColorScheme/Rosepine.json @@ -1,19 +1,19 @@ { "dark": { "mPrimary": "#ebbcba", - "mOnPrimary": "#1f1d2e", + "mOnPrimary": "#191724", "mSecondary": "#9ccfd8", - "mOnSecondary": "#1f1d2e", + "mOnSecondary": "#191724", "mTertiary": "#f6c177", - "mOnTertiary": "#1f1d2e", + "mOnTertiary": "#191724", "mError": "#eb6f92", - "mOnError": "#1f1d2e", - "mSurface": "#1f1d2e", + "mOnError": "#191724", + "mSurface": "#191724", "mOnSurface": "#e0def4", "mSurfaceVariant": "#26233a", "mOnSurfaceVariant": "#908caa", "mOutline": "#403d52", - "mShadow": "#1f1d2e" + "mShadow": "#191724" }, "light": { "mPrimary": "#d46e6b", diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml index 690a92e..928f839 100644 --- a/Modules/Bar/Widgets/Volume.qml +++ b/Modules/Bar/Widgets/Volume.qml @@ -45,7 +45,7 @@ Item { if (AudioService.muted) { return "volume-mute" } - return AudioService.volume <= Number.EPSILON ? "volume-off" : (AudioService.volume < 0.5 ? "volume-down" : "volume-up") + return AudioService.volume <= 0.2? "volume-off" : (AudioService.volume < 0.6 ? "volume-down" : "volume-up") } // Connection used to open the pill when volume changes diff --git a/Widgets/NPill.qml b/Widgets/NPill.qml index a64332f..18987a3 100644 --- a/Widgets/NPill.qml +++ b/Widgets/NPill.qml @@ -102,10 +102,8 @@ Item { height: iconSize radius: width * 0.5 // When forced shown, match pill background; otherwise use accent when hovered - color: forceOpen ? pillColor : (showPill ? iconCircleColor : Color.mSurfaceVariant) + color: forceOpen ? Color.mSurface : (showPill ? iconCircleColor : Color.mSurfaceVariant) anchors.verticalCenter: parent.verticalCenter - border.width: Math.max(1, Style.borderS * scaling) - border.color: forceOpen ? Qt.alpha(Color.mOutline, 0.5) : Color.transparent x: rightOpen ? 0 : (parent.width - width)