From aae2bfc2f8d5ac3a4bccbb1f12c67e304d842a36 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 9 Mar 2026 10:45:56 +0100 Subject: [PATCH] change ws indicator --- modules/Bar/StatusIcons.qml | 22 +++++++++++----------- modules/Bar/Ws.qml | 7 ++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/Bar/StatusIcons.qml b/modules/Bar/StatusIcons.qml index 1a351d7..b6ca337 100644 --- a/modules/Bar/StatusIcons.qml +++ b/modules/Bar/StatusIcons.qml @@ -24,28 +24,28 @@ Rectangle { if (charging) { return "\uf250"; } - if (percentage < 0.12) { + if (percentage <= 0.12) { return "\uf30d"; } - if (percentage < 0.24) { + if (percentage <= 0.24) { return "\uf257"; } - if (percentage < 0.36) { + if (percentage <= 0.36) { return "\uf256"; } - if (percentage < 0.48) { + if (percentage <= 0.48) { return "\uf255"; } - if (percentage < 0.60) { + if (percentage <= 0.60) { return "\uf254"; } - if (percentage < 0.72) { + if (percentage <= 0.72) { return "\uf253"; } - if (percentage < 0.84) { + if (percentage <= 0.84) { return "\uf252"; } - if (percentage > 0.84) { + if (percentage >= 0.84) { return "\uf24f"; } } @@ -53,13 +53,13 @@ Rectangle { if (audioMute) { return "\ue04f"; } - if (audioPercentage < 0.33) { + if (audioPercentage <= 0.33) { return "\ue04e"; } - if (audioPercentage < 0.66) { + if (audioPercentage <= 0.66) { return "\ue04d"; } - if (audioPercentage > 0.66) { + if (audioPercentage >= 0.66) { return "\ue050"; } } diff --git a/modules/Bar/Ws.qml b/modules/Bar/Ws.qml index 3c839d4..a669e03 100644 --- a/modules/Bar/Ws.qml +++ b/modules/Bar/Ws.qml @@ -16,7 +16,7 @@ Rectangle { implicitHeight: wsLayout.implicitHeight + 6 RowLayout { id: wsLayout - spacing: 0 + spacing: 2 anchors.centerIn: parent Repeater { id: wsRep @@ -27,13 +27,14 @@ Rectangle { implicitHeight: Settings.config.barHeight / 2 visible: modelData.id < 0 ? false : modelData.monitor?.name == wsWrap.barScreen.name required property var modelData - color: modelData.focused ? ThemeLoader.colors.base05 : ThemeLoader.colors.base03 + color: "transparent" radius: Settings.config.rounding CText { id: wsText anchors.centerIn: parent text: wsRect.modelData.id - color: parent.modelData.focused ? ThemeLoader.colors.base00 : ThemeLoader.colors.base05 + color: ThemeLoader.colors.base07 + opacity: parent.modelData.focused ? 1 : 0.5 } MouseArea { id: mouseHandler