From b1d0be5d3120f758714f251ffb6129964947be6e Mon Sep 17 00:00:00 2001
From: Damocles <damocles@darkest.space>
Date: Sun, 26 Apr 2026 19:01:51 +0200
Subject: [PATCH] remove bar dependency from modules, use
 QsWindow.window.screen instead

---
 shell/modules/Bar.qml              | 12 +++---------
 shell/modules/MprisModule.qml      |  2 --
 shell/modules/TrayModule.qml       |  3 +--
 shell/modules/WorkspacesModule.qml |  4 +---
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/shell/modules/Bar.qml b/shell/modules/Bar.qml
index 5ca2c26..8f02163 100644
--- a/shell/modules/Bar.qml
+++ b/shell/modules/Bar.qml
@@ -135,15 +135,11 @@ PanelWindow {
             M.BarGroup {
                 id: workspacesGroup
                 leftEdge: true
-                M.WorkspacesModule {
-                    bar: bar
-                }
+                M.WorkspacesModule {}
             }
             M.BarGroup {
                 leftEdge: !workspacesGroup.visible
-                M.TrayModule {
-                    bar: bar
-                }
+                M.TrayModule {}
             }
             M.BarGroup {
                 id: _windowTitleGroup
@@ -174,9 +170,7 @@ PanelWindow {
 
             // Media
             M.BarGroup {
-                M.MprisModule {
-                    bar: bar
-                }
+                M.MprisModule {}
                 M.VolumeModule {}
             }
 
diff --git a/shell/modules/MprisModule.qml b/shell/modules/MprisModule.qml
index dcd5553..7a46d7c 100644
--- a/shell/modules/MprisModule.qml
+++ b/shell/modules/MprisModule.qml
@@ -55,8 +55,6 @@ M.BarModule {
         }
     }
 
-    required property var bar
-
     M.BarIcon {
         icon: S.MprisService.playing ? "\uF04B" : (S.MprisService.player?.playbackState === MprisPlaybackState.Paused ? "\uDB80\uDFE4" : "\uDB81\uDCDB")
         anchors.verticalCenter: parent.verticalCenter
diff --git a/shell/modules/TrayModule.qml b/shell/modules/TrayModule.qml
index 85cddf4..911b3e8 100644
--- a/shell/modules/TrayModule.qml
+++ b/shell/modules/TrayModule.qml
@@ -14,7 +14,6 @@ M.BarModule {
 
     active: S.Modules.tray.enable && _trayRepeater.count > 0
 
-    required property var bar
     property var _activeMenu: null
 
     // --- debug logging (remove once tray is confirmed working) ---
@@ -104,7 +103,7 @@ M.BarModule {
                 M.TrayMenu {
                     accentColor: root.accentColor
                     handle: iconItem.modelData.menu
-                    screen: root.bar.screen
+                    screen: QsWindow.window?.screen ?? null
                     anchorX: iconItem.mapToGlobal(iconItem.width / 2, 0).x - (QsWindow.window?.screen?.x ?? 0)
                     onDismissed: {
                         menuLoader.active = false;
diff --git a/shell/modules/WorkspacesModule.qml b/shell/modules/WorkspacesModule.qml
index 978460e..ad099a4 100644
--- a/shell/modules/WorkspacesModule.qml
+++ b/shell/modules/WorkspacesModule.qml
@@ -10,11 +10,9 @@ M.BarModule {
     spacing: 4
     cursorShape: Qt.ArrowCursor
 
-    required property var bar
-
     property var _allWorkspaces: []
     property int _activeId: -1
-    readonly property string _output: bar.screen?.name ?? ""
+    readonly property string _output: QsWindow.window?.screen?.name ?? ""
     readonly property var _workspaces: _allWorkspaces.filter(w => w.output === root._output)
 
     // Initial state