From 19312d94c3e6492468969aab258bb3c470b457fc Mon Sep 17 00:00:00 2001 From: LemmyCook Date: Sun, 14 Sep 2025 17:21:38 -0400 Subject: [PATCH] Removing test mode on battery --- Modules/Bar/Widgets/Battery.qml | 4 ++-- Modules/Bar/Widgets/Brightness.qml | 2 +- Modules/Bar/Widgets/KeyboardLayout.qml | 2 +- Modules/Bar/Widgets/Microphone.qml | 2 +- Modules/Bar/Widgets/Volume.qml | 5 +++-- Widgets/NPill.qml | 6 +++--- Widgets/NPillHorizontal.qml | 8 ++++---- Widgets/NPillVertical.qml | 8 ++++---- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Modules/Bar/Widgets/Battery.qml b/Modules/Bar/Widgets/Battery.qml index 5509345..e7aee4d 100644 --- a/Modules/Bar/Widgets/Battery.qml +++ b/Modules/Bar/Widgets/Battery.qml @@ -34,7 +34,7 @@ Item { readonly property real warningThreshold: widgetSettings.warningThreshold !== undefined ? widgetSettings.warningThreshold : widgetMetadata.warningThreshold // Test mode - readonly property bool testMode: true + readonly property bool testMode: false readonly property int testPercent: 100 readonly property bool testCharging: false @@ -89,7 +89,7 @@ Item { text: (isReady || testMode) ? Math.round(percent) : "-" autoHide: false forceOpen: isReady && (testMode || battery.isLaptopBattery) && displayMode === "alwaysShow" - forceClosed: displayMode === "alwaysHide" + forceClose: displayMode === "alwaysHide" disableOpen: (!isReady || (!testMode && !battery.isLaptopBattery)) tooltipText: { let lines = [] diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml index efcbe8d..ee1f45b 100644 --- a/Modules/Bar/Widgets/Brightness.qml +++ b/Modules/Bar/Widgets/Brightness.qml @@ -83,7 +83,7 @@ Item { return monitor ? Math.round(monitor.brightness * 100) : "" } forceOpen: displayMode === "alwaysShow" - forceClosed: displayMode === "alwaysHide" + forceClose: displayMode === "alwaysHide" tooltipText: { var monitor = getMonitor() if (!monitor) diff --git a/Modules/Bar/Widgets/KeyboardLayout.qml b/Modules/Bar/Widgets/KeyboardLayout.qml index 444df7d..5c6c9ab 100644 --- a/Modules/Bar/Widgets/KeyboardLayout.qml +++ b/Modules/Bar/Widgets/KeyboardLayout.qml @@ -48,7 +48,7 @@ Item { text: currentLayout.toUpperCase() tooltipText: "Keyboard layout: " + currentLayout.toUpperCase() forceOpen: root.displayMode === "forceOpen" - forceClosed: root.displayMode === "alwaysHide" + forceClose: root.displayMode === "alwaysHide" fontSize: Style.fontSizeS // Use larger font size onClicked: { diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml index 29844e9..c2b5973 100644 --- a/Modules/Bar/Widgets/Microphone.qml +++ b/Modules/Bar/Widgets/Microphone.qml @@ -93,7 +93,7 @@ Item { autoHide: false // Important to be false so we can hover as long as we want text: Math.floor(AudioService.inputVolume * 100) forceOpen: displayMode === "alwaysShow" - forceClosed: displayMode === "alwaysHide" + forceClose: displayMode === "alwaysHide" tooltipText: "Microphone: " + Math.round(AudioService.inputVolume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute." onWheel: function (delta) { diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml index c87a510..a522f16 100644 --- a/Modules/Bar/Widgets/Volume.qml +++ b/Modules/Bar/Widgets/Volume.qml @@ -30,6 +30,7 @@ Item { return {} } + readonly property bool isVertical: Settings.data.bar.position === "left" || Settings.data.bar.position === "right" readonly property string displayMode: (widgetSettings.displayMode !== undefined) ? widgetSettings.displayMode : widgetMetadata.displayMode // Used to avoid opening the pill on Quickshell startup @@ -76,9 +77,9 @@ Item { rightOpen: BarWidgetRegistry.getNPillDirection(root) icon: getIcon() autoHide: false // Important to be false so we can hover as long as we want - text: Math.floor(AudioService.volume * 100) + text: `${Math.floor(AudioService.volume * 100)}${isVertical ? "" : "%"}` forceOpen: displayMode === "alwaysShow" - forceClosed: displayMode === "alwaysHide" + forceClose: displayMode === "alwaysHide" tooltipText: "Volume: " + Math.round(AudioService.volume * 100) + "%\nLeft click for advanced settings.\nScroll up/down to change volume.\nRight click to toggle mute." onWheel: function (delta) { diff --git a/Widgets/NPill.qml b/Widgets/NPill.qml index 08617d3..80bee30 100644 --- a/Widgets/NPill.qml +++ b/Widgets/NPill.qml @@ -12,7 +12,7 @@ Item { property real sizeRatio: 0.8 property bool autoHide: false property bool forceOpen: false - property bool forceClosed: false + property bool forceClose: false property bool disableOpen: false property bool rightOpen: false property bool hovered: false @@ -48,7 +48,7 @@ Item { sizeRatio: root.sizeRatio autoHide: root.autoHide forceOpen: root.forceOpen - forceClosed: root.forceClosed + forceClose: root.forceClose disableOpen: root.disableOpen rightOpen: root.rightOpen hovered: root.hovered @@ -74,7 +74,7 @@ Item { sizeRatio: root.sizeRatio autoHide: root.autoHide forceOpen: root.forceOpen - forceClosed: root.forceClosed + forceClose: root.forceClose disableOpen: root.disableOpen rightOpen: root.rightOpen hovered: root.hovered diff --git a/Widgets/NPillHorizontal.qml b/Widgets/NPillHorizontal.qml index 9ba6b3c..bff3b43 100644 --- a/Widgets/NPillHorizontal.qml +++ b/Widgets/NPillHorizontal.qml @@ -12,7 +12,7 @@ Item { property real sizeRatio: 0.8 property bool autoHide: false property bool forceOpen: false - property bool forceClosed: false + property bool forceClose: false property bool disableOpen: false property bool rightOpen: false property bool hovered: false @@ -27,7 +27,7 @@ Item { readonly property bool openLeftward: !rightOpen // Effective shown state (true if animated open or forced, but not if force closed) - readonly property bool revealed: !forceClosed && (forceOpen || showPill) + readonly property bool revealed: !forceClose && (forceOpen || showPill) signal shown signal hidden @@ -254,7 +254,7 @@ Item { hovered = true root.entered() tooltip.show() - if (disableOpen || forceClosed) { + if (disableOpen || forceClose) { return } if (!forceOpen) { @@ -264,7 +264,7 @@ Item { onExited: { hovered = false root.exited() - if (!forceOpen && !forceClosed) { + if (!forceOpen && !forceClose) { hide() } tooltip.hide() diff --git a/Widgets/NPillVertical.qml b/Widgets/NPillVertical.qml index 9c4fbb3..f25867e 100644 --- a/Widgets/NPillVertical.qml +++ b/Widgets/NPillVertical.qml @@ -12,7 +12,7 @@ Item { property real sizeRatio: 0.8 property bool autoHide: false property bool forceOpen: false - property bool forceClosed: false + property bool forceClose: false property bool disableOpen: false property bool rightOpen: false property bool hovered: false @@ -27,7 +27,7 @@ Item { readonly property bool openUpward: !rightOpen // Effective shown state (true if animated open or forced, but not if force closed) - readonly property bool revealed: !forceClosed && (forceOpen || showPill) + readonly property bool revealed: !forceClose && (forceOpen || showPill) signal shown signal hidden @@ -256,7 +256,7 @@ Item { hovered = true root.entered() tooltip.show() - if (disableOpen || forceClosed) { + if (disableOpen || forceClose) { return } if (!forceOpen) { @@ -266,7 +266,7 @@ Item { onExited: { hovered = false root.exited() - if (!forceOpen && !forceClosed) { + if (!forceOpen && !forceClose) { hide() } tooltip.hide()