feat(screenshot): add island snap targets (#3881)

port 2.0 (cherry picked from commit 1e31015acb)
2026-10-23 11:44:00 -04:00 · 2026-10-23 14:51:30 +00:00
parent 36ebe0e3ef
commit a680e1bd39
2 changed files with 93 additions and 0 deletions
@@ -338,9 +338,102 @@ Singleton {
        _requestPopout(popout, tabIndex, triggerSource, true);
    }

+    function _islandBarBand(host, screen) {
+        const vertical = host.edge === "left" || host.edge === "right";
+        if (host.embedded) {
+            const start = vertical ? host.hostOriginX : host.hostOriginY;
+            return {
+                "start": start,
+                "end": start + host.bandThickness
+            };
+        }
+        if (host.freeMode)
+            return null;
+
+        const extent = vertical ? screen.width : screen.height;
+        const instances = ShellLayout.forScreen(screen)?.instances ?? [];
+        let start = Infinity;
+        let end = -Infinity;
+        for (const instance of instances) {
+            if (instance.edge !== host.edge || instance.barId === host.barId || (instance.kind !== "bar" && instance.kind !== "frame") || instance.rowThickness <= 0)
+                continue;
+            const config = SettingsData.getBarConfig(instance.barId);
+            if (!config || config.enabled === false || config.visible === false)
+                continue;
+            const near = instance.rowOffset ?? 0;
+            const far = near + instance.rowThickness;
+            const bandStart = host.edge === "top" || host.edge === "left" ? near : extent - far;
+            const bandEnd = host.edge === "top" || host.edge === "left" ? far : extent - near;
+            start = Math.min(start, bandStart);
+            end = Math.max(end, bandEnd);
+        }
+        return end > start ? {
+            "start": start,
+            "end": end
+        } : null;
+    }
+
    function getActiveSurfaces() {
        const results = [];

+        // The host registry covers embedded, standalone, and free Islands with their live visual bounds.
+        for (const key of Object.keys(IslandHostRegistry.hosts || {})) {
+            const host = IslandHostRegistry.hosts[key];
+            const screen = host?.screen;
+            const controller = host?.islandController;
+            const snapVisible = controller?.expanded || (!host?.embedded && host?.motionRunning);
+            if (!screen?.name || !snapVisible || host.surfaceOpacity <= 0)
+                continue;
+            const rect = host.surfaceBodyRect?.();
+            if (!rect || rect.width <= 0 || rect.height <= 0)
+                continue;
+            let x = rect.x;
+            let y = rect.y;
+            let width = rect.width;
+            let height = rect.height;
+            const barBand = _islandBarBand(host, screen);
+            if (barBand) {
+                switch (host.edge) {
+                case "top":
+                    if (y < barBand.end && y + height > barBand.start) {
+                        const inset = Math.max(0, Math.min(height, barBand.end - y));
+                        y += inset;
+                        height -= inset;
+                    }
+                    break;
+                case "bottom":
+                    if (y + height > barBand.start && y < barBand.end)
+                        height = Math.max(0, barBand.start - y);
+                    break;
+                case "left":
+                    if (x < barBand.end && x + width > barBand.start) {
+                        const inset = Math.max(0, Math.min(width, barBand.end - x));
+                        x += inset;
+                        width -= inset;
+                    }
+                    break;
+                case "right":
+                    if (x + width > barBand.start && x < barBand.end)
+                        width = Math.max(0, barBand.start - x);
+                    break;
+                }
+            }
+            const left = Math.max(0, x);
+            const top = Math.max(0, y);
+            const right = Math.min(screen.width, x + width);
+            const bottom = Math.min(screen.height, y + height);
+            if (right <= left || bottom <= top)
+                continue;
+            results.push({
+                "name": "dms:dankisland-surface",
+                "type": "island",
+                "x": Math.round((screen.x ?? 0) + left),
+                "y": Math.round((screen.y ?? 0) + top),
+                "width": Math.round(right - left),
+                "height": Math.round(bottom - top)
+            });
+        }
+
        for (const screenName in currentPopoutsByScreen) {
            const popout = currentPopoutsByScreen[screenName];
            if (!popout || !popout.shouldBeVisible)