From edba9cc92878605470f3957c5ea25118b8d10d97 Mon Sep 17 00:00:00 2001 From: Hannes Date: Tue, 9 Jun 2026 00:32:40 +0200 Subject: [PATCH] fixes to workspace without apps --- modules/bar/widgets/Battery.qml | 2 +- modules/bar/widgets/Workspaces.qml | 17 ++++++++++++----- modules/wlogout/WlogoutLoader.qml | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/bar/widgets/Battery.qml b/modules/bar/widgets/Battery.qml index bd4a263..c482b0c 100644 --- a/modules/bar/widgets/Battery.qml +++ b/modules/bar/widgets/Battery.qml @@ -111,7 +111,7 @@ MouseArea { BatteryState.start() } - console.log("battery available:", hasBattery) + // console.log("battery available:", hasBattery) } } } diff --git a/modules/bar/widgets/Workspaces.qml b/modules/bar/widgets/Workspaces.qml index 5f0f972..fa83b6a 100644 --- a/modules/bar/widgets/Workspaces.qml +++ b/modules/bar/widgets/Workspaces.qml @@ -32,7 +32,7 @@ Row { // Workspace Row active: modelData.monitor === thisMonitor sourceComponent: Rectangle { //workspace // visible: modelData.monitor === thisMonitor - width: Math.max(workspaceNum.width + workspaceText.width+Config.spacing*2, bar.height) + width: workspaceText.text.length === 0 ? Math.max(workspaceNum.width + Config.spacing*2, workspaceNum.height + Config.spacing) : Math.max(workspaceNum.width + workspaceText.width + Config.spacing*2, bar.height) height: workspaceNum.height + Config.spacing radius: Config.small_radius color: ( @@ -52,13 +52,16 @@ Row { // Workspace Row hoverEnabled: true cursorShape: Qt.PointingHandCursor anchors.fill: parent - onClicked: Hyprland.dispatch("workspace " + modelData.id) + onClicked: { + Hyprland.dispatch("workspace " + modelData.id) + // console.log("workspaceText: " + workspaceText.text.length) + } Row { id: workspaceRow anchors.centerIn: parent spacing: Math.floor(bar.height/8) - leftPadding: Math.floor(bar.height/4) + leftPadding: workspaceText.text.length === 0 ? 0 : Math.floor(bar.height / 4) Text { id: workspaceNum @@ -95,8 +98,12 @@ Row { // Workspace Row stdout: StdioCollector { onStreamFinished: { - workspaceText.text = this.text - // console.log("workspaceScript output:", this.text) + if (this.text.length > 1) { + workspaceText.text = this.text + } else { + workspaceText.text = "" + } + // console.log("workspaceScript output:", workspaceText.text, workspaceText.text.length) } } } diff --git a/modules/wlogout/WlogoutLoader.qml b/modules/wlogout/WlogoutLoader.qml index 769054f..963c44e 100644 --- a/modules/wlogout/WlogoutLoader.qml +++ b/modules/wlogout/WlogoutLoader.qml @@ -3,7 +3,7 @@ import Quickshell import Quickshell.Hyprland import Quickshell.Io -import "../../states/wallpaper" as Global +import "../../states/wallpaperdir" as Global Item { // container, invisible