From 09ca37c9fcf5cc09a0f6a00c8f7b2f5a1985f5ed Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Fri, 3 Jul 2026 11:21:30 -0400
Subject: [PATCH] workspace: fix occupied color in niri fixes #2538

---
 quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
index 9b72e1ab6..b818304d0 100644
--- a/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -1067,10 +1067,8 @@ Item {
                         return Array.from(Hyprland.toplevels?.values || []).some(tl => tl.workspace?.id === modelData?.id);
                     if (root.isMango)
                         return modelData.clients > 0;
-                    if (CompositorService.isNiri) {
-                        const workspace = NiriService.allWorkspaces.find(ws => ws.idx + 1 === modelData && ws.output === root.effectiveScreenName);
-                        return workspace ? (NiriService.windows?.some(win => win.workspace_id === workspace.id) ?? false) : false;
-                    }
+                    if (CompositorService.isNiri)
+                        return NiriService.windows?.some(win => win.workspace_id === modelData?.id) ?? false;
                     return false;
                 }
                 property bool isPlaceholder: {