From 6c4a9bcfb8c2fad3e406f959740afdfee1243019 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Mon, 24 Nov 2025 09:38:03 -0500
Subject: [PATCH] modals: restore Top layer as default - Cut a mask in the
 background window - restores virt kb compat

---
 quickshell/Modals/Common/DankModal.qml | 25 +++++++++++++++++--------
 quickshell/Widgets/DankPopout.qml      | 15 +++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/quickshell/Modals/Common/DankModal.qml b/quickshell/Modals/Common/DankModal.qml
index f3979116..17a38126 100644
--- a/quickshell/Modals/Common/DankModal.qml
+++ b/quickshell/Modals/Common/DankModal.qml
@@ -49,10 +49,7 @@ Item {
     signal dialogClosed
     signal backgroundClicked
 
-    readonly property bool useBackgroundWindow: {
-        const layerOverride = Quickshell.env("DMS_MODAL_LAYER");
-        return !layerOverride || layerOverride === "overlay";
-    }
+    readonly property bool useBackgroundWindow: true
 
     function open() {
         ModalManager.openModal(root);
@@ -146,6 +143,16 @@ Item {
             bottom: true
         }
 
+        mask: Region {
+            item: Rectangle {
+                x: root.alignedX
+                y: root.alignedY
+                width: root.shouldBeVisible ? root.alignedWidth : 0
+                height: root.shouldBeVisible ? root.alignedHeight : 0
+            }
+            intersection: Intersection.Xor
+        }
+
         MouseArea {
             anchors.fill: parent
             enabled: root.closeOnBackgroundClick && root.shouldBeVisible
@@ -186,13 +193,15 @@ Item {
         WlrLayershell.layer: {
             switch (Quickshell.env("DMS_MODAL_LAYER")) {
             case "bottom":
-                return WlrLayershell.Bottom;
-            case "top":
+                console.error("DankModal: 'bottom' layer is not valid for modals. Defaulting to 'top' layer.");
                 return WlrLayershell.Top;
             case "background":
-                return WlrLayershell.Background;
-            default:
+                console.error("DankModal: 'background' layer is not valid for modals. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "overlay":
                 return WlrLayershell.Overlay;
+            default:
+                return WlrLayershell.Top;
             }
         }
         WlrLayershell.exclusiveZone: -1
diff --git a/quickshell/Widgets/DankPopout.qml b/quickshell/Widgets/DankPopout.qml
index c42e13d4..a7ba1be7 100644
--- a/quickshell/Widgets/DankPopout.qml
+++ b/quickshell/Widgets/DankPopout.qml
@@ -91,10 +91,7 @@ Item {
         setBarContext(pos, bottomGap);
     }
 
-    readonly property bool useBackgroundWindow: {
-        const layerOverride = Quickshell.env("DMS_POPOUT_LAYER");
-        return !layerOverride || layerOverride === "overlay";
-    }
+    readonly property bool useBackgroundWindow: true
 
     function open() {
         if (!screen)
@@ -258,13 +255,15 @@ Item {
         WlrLayershell.layer: {
             switch (Quickshell.env("DMS_POPOUT_LAYER")) {
             case "bottom":
-                return WlrLayershell.Bottom;
-            case "top":
+                console.warn("DankPopout: 'bottom' layer is not valid for popouts. Defaulting to 'top' layer.");
                 return WlrLayershell.Top;
             case "background":
-                return WlrLayershell.Background;
-            default:
+                console.warn("DankPopout: 'background' layer is not valid for popouts. Defaulting to 'top' layer.");
+                return WlrLayershell.Top;
+            case "overlay":
                 return WlrLayershell.Overlay;
+            default:
+                return WlrLayershell.Top;
             }
         }
         WlrLayershell.exclusiveZone: -1