frame: merge bars with frame window and get things on Top layer by

default

quickshell/Services/BarWidgetService.qml

@@ -12,6 +12,50 @@ Singleton {
     property var widgetRegistry: ({})
     property var dankBarRepeater: null
 
+    // Bars rendered inside the frame surface (connected mode) have no DankBarWindow in the
+    // repeater, so they self-register here (screenName -> DankBarBody) for trigger routing.
+    property var frameHostedBars: ({})
+
+    // Shared dock context-menu windows (created in DMSShell) so a frame-hosted dock can reach them.
+    property var dockContextMenu: null
+    property var dockTrashContextMenu: null
+
+    function registerFrameBar(screenName, body) {
+        if (!screenName || !body)
+            return;
+        const next = Object.assign({}, frameHostedBars);
+        next[screenName] = body;
+        frameHostedBars = next;
+    }
+
+    function unregisterFrameBar(screenName, body) {
+        if (!screenName || frameHostedBars[screenName] !== body)
+            return;
+        const next = Object.assign({}, frameHostedBars);
+        delete next[screenName];
+        frameHostedBars = next;
+    }
+
+    // DankBar items self-register here (barConfig id -> DankBar) so frame-hosted bars can
+    // resolve their models/rootWindow reactively, independent of repeater load ordering.
+    property var dankBarItems: ({})
+
+    function registerDankBarItem(barId, item) {
+        if (!barId || !item)
+            return;
+        const next = Object.assign({}, dankBarItems);
+        next[barId] = item;
+        dankBarItems = next;
+    }
+
+    function unregisterDankBarItem(barId, item) {
+        if (!barId || dankBarItems[barId] !== item)
+            return;
+        const next = Object.assign({}, dankBarItems);
+        delete next[barId];
+        dankBarItems = next;
+    }
+
     signal widgetRegistered(string widgetId, string screenName)
     signal widgetUnregistered(string widgetId, string screenName)
 
@@ -141,6 +185,9 @@ Singleton {
     }
 
     function getBarWindowForScreen(screenName) {
+        if (frameHostedBars[screenName])
+            return frameHostedBars[screenName];
+
         if (!dankBarRepeater)
             return null;
 
@@ -170,17 +217,18 @@ Singleton {
     }
 
     function getFirstBarWindow() {
-        if (!dankBarRepeater || dankBarRepeater.count === 0)
-            return null;
+        if (dankBarRepeater) {
+            for (var i = 0; i < dankBarRepeater.count; i++) {
+                const barItem = dankBarRepeater.itemAt(i)?.item;
+                if (barItem?.barVariants?.instances?.length > 0)
+                    return barItem.barVariants.instances[0];
+            }
+        }
 
-        const loader = dankBarRepeater.itemAt(0);
-        if (!loader?.item)
-            return null;
-
-        const barItem = loader.item;
-        if (!barItem.barVariants?.instances || barItem.barVariants.instances.length === 0)
-            return null;
-
-        return barItem.barVariants.instances[0];
+        for (const screenName in frameHostedBars) {
+            if (frameHostedBars[screenName])
+                return frameHostedBars[screenName];
+        }
+        return null;
     }
 }

quickshell/Services/CompositorService.qml

@@ -533,43 +533,6 @@ Singleton {
         return false;
     }
 
-    function hasFullscreenToplevelOnScreen(screenOrName) {
-        const screenName = _screenName(screenOrName);
-        if (!screenName)
-            return false;
-
-        if (isNiri) {
-            const active = ToplevelManager.activeToplevel;
-            if (active?.fullscreen && active?.activated && _toplevelOnScreen(active, screenName))
-                return true;
-
-            const filtered = filterCurrentWorkspace(sortedToplevels, screenName);
-            for (let i = 0; i < filtered.length; i++) {
-                if (filtered[i]?.fullscreen)
-                    return true;
-            }
-            return false;
-        }
-
-        if (isHyprland) {
-            const filtered = filterCurrentWorkspace(sortedToplevels, screenName);
-            for (let i = 0; i < filtered.length; i++) {
-                if (filtered[i]?.fullscreen)
-                    return true;
-            }
-            return false;
-        }
-
-        if (!ToplevelManager.toplevels?.values)
-            return false;
-
-        for (const toplevel of ToplevelManager.toplevels.values) {
-            if (toplevel?.fullscreen && _toplevelOnScreen(toplevel, screenName))
-                return true;
-        }
-        return false;
-    }
-
     function _hyprlandToplevelMapped(hyprToplevel) {
         if (!hyprToplevel)
             return false;
@@ -630,12 +593,6 @@ Singleton {
     // Per-screen cache for connectedFrameBlockedOnScreen to avoid recomputing on every consumer binding.
     property var frameBlockedByScreen: ({})
 
-    function _computeConnectedFrameBlocked(screenName) {
-        if (hasFullscreenToplevelOnScreen(screenName))
-            return true;
-        return hyprlandSpecialWorkspaceBlocksConnectedFrame(screenName);
-    }
-
     function _recomputeFrameBlocked() {
         const screens = Quickshell.screens || [];
         const next = {};
@@ -644,7 +601,7 @@ Singleton {
             const name = screens[i]?.name;
             if (!name)
                 continue;
-            const blocked = _computeConnectedFrameBlocked(name);
+            const blocked = hyprlandSpecialWorkspaceBlocksConnectedFrame(name);
             next[name] = blocked;
             if (frameBlockedByScreen[name] !== blocked)
                 changed = true;
@@ -668,7 +625,7 @@ Singleton {
         const cached = frameBlockedByScreen[screenName];
         if (cached !== undefined)
             return cached;
-        return _computeConnectedFrameBlocked(screenName);
+        return hyprlandSpecialWorkspaceBlocksConnectedFrame(screenName);
     }
 
     Connections {
@@ -730,6 +687,23 @@ Singleton {
         return FrameTransitionState.effectiveConnectedFrameModeActive && frameWindowVisibleForScreen(screenOrName);
     }
 
+    // Connected mode renders the bar inside the frame surface. True whenever connected
+    // chrome is configured for the screen, independent of the fullscreen block, so the
+    // standalone bar surface stays suppressed while the frame-hosted bar hides with the frame.
+    function frameHostsSurfacesForScreen(screenOrName) {
+        return FrameTransitionState.effectiveConnectedFrameModeActive && frameConfiguredForScreen(screenOrName);
+    }
+
+    // A surface set to the overlay layer cannot live inside the frame's single top-layer window,
+    // so it stays a standalone window (which resolves itself onto the overlay layer) even in connected mode.
+    function frameHostsBarForConfig(screenOrName, barConfig) {
+        return frameHostsSurfacesForScreen(screenOrName) && !(barConfig?.useOverlayLayer ?? false);
+    }
+
+    function frameHostsDockForScreen(screenOrName) {
+        return frameHostsSurfacesForScreen(screenOrName) && !SettingsData.dockUseOverlayLayer;
+    }
+
     function framePeerSurfacesUseOverlayForScreen(screenOrName) {
         return frameWindowVisibleForScreen(screenOrName);
     }