From bbebeb1402c18ccf78f616defd0532dc5d904cd4 Mon Sep 17 00:00:00 2001
From: purian23 <purian23@gmail.com>
Date: Fri, 1 May 2026 19:57:09 -0400
Subject: [PATCH] fix(DankLauncher): Update click area input on first launch &
 adjust footer

---
 .../DankLauncherV2ModalConnected.qml          | 31 +++++++++++++++----
 .../Modals/DankLauncherV2/LauncherContent.qml |  8 +++--
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml b/quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml
index a57190f1..a54c867d 100644
--- a/quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml
+++ b/quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml
@@ -596,16 +596,21 @@ Item {
         visible: false
         color: "transparent"
 
+        readonly property real _topMargin: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
+        readonly property real _bottomMargin: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
+        readonly property real _leftMargin: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
+        readonly property real _rightMargin: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
+
         WlrLayershell.namespace: "dms:spotlight:bg"
         WlrLayershell.layer: WlrLayershell.Top
         WlrLayershell.exclusiveZone: -1
         WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
 
         WlrLayershell.margins {
-            top: contentContainer.dockTop ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 0 ? Theme.px(42, root.dpr) : 0)
-            bottom: contentContainer.dockBottom ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 1 ? Theme.px(42, root.dpr) : 0)
-            left: contentContainer.dockLeft ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 2 ? Theme.px(42, root.dpr) : 0)
-            right: contentContainer.dockRight ? contentContainer.dockThickness : (typeof SettingsData !== "undefined" && SettingsData.barPosition === 3 ? Theme.px(42, root.dpr) : 0)
+            top: backgroundWindow._topMargin
+            bottom: backgroundWindow._bottomMargin
+            left: backgroundWindow._leftMargin
+            right: backgroundWindow._rightMargin
         }
 
         anchors {
@@ -617,6 +622,11 @@ Item {
 
         mask: Region {
             item: (spotlightOpen || isClosing) ? bgFullScreenMask : null
+
+            Region {
+                item: bgContentHole
+                intersection: Intersection.Subtract
+            }
         }
 
         Item {
@@ -624,6 +634,15 @@ Item {
             anchors.fill: parent
         }
 
+        Item {
+            id: bgContentHole
+            visible: false
+            x: root._cwMarginLeft + contentContainer.x - backgroundWindow._leftMargin
+            y: root._cwMarginTop + contentContainer.y - backgroundWindow._topMargin
+            width: root.alignedWidth
+            height: root.contentSurfaceHeight
+        }
+
         Rectangle {
             id: backgroundDarken
             anchors.fill: parent
@@ -702,8 +721,8 @@ Item {
         Item {
             id: contentInputMask
             visible: false
-            x: contentContainer.x + contentWrapper.x
-            y: contentContainer.y + contentWrapper.y
+            x: contentContainer.x
+            y: contentContainer.y
             width: root.alignedWidth
             height: root.contentSurfaceHeight
         }
diff --git a/quickshell/Modals/DankLauncherV2/LauncherContent.qml b/quickshell/Modals/DankLauncherV2/LauncherContent.qml
index f1fd775c..fa63bd46 100644
--- a/quickshell/Modals/DankLauncherV2/LauncherContent.qml
+++ b/quickshell/Modals/DankLauncherV2/LauncherContent.qml
@@ -274,14 +274,16 @@ FocusScope {
 
         Item {
             id: footerBar
+            readonly property bool _connectedBottomEmerge: (root.parentModal?.frameOwnsConnectedChrome ?? false) && (root.parentModal?.resolvedConnectedBarSide === "bottom")
+            readonly property bool _connectedArcAtFooter: _connectedBottomEmerge && !(root.parentModal?.launcherArcExtenderActive ?? false)
+            readonly property bool showFooter: SettingsData.dankLauncherV2Size !== "micro" && SettingsData.dankLauncherV2ShowFooter
+
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
             anchors.leftMargin: root.parentModal?.borderWidth ?? 1
             anchors.rightMargin: root.parentModal?.borderWidth ?? 1
-            anchors.bottomMargin: root.parentModal?.borderWidth ?? 1
-            readonly property bool showFooter: SettingsData.dankLauncherV2Size !== "micro" && SettingsData.dankLauncherV2ShowFooter
-            readonly property bool _connectedArcAtFooter: (root.parentModal?.frameOwnsConnectedChrome ?? false) && (root.parentModal?.resolvedConnectedBarSide === "bottom") && !(root.parentModal?.launcherArcExtenderActive ?? false)
+            anchors.bottomMargin: _connectedBottomEmerge ? Theme.spacingM : (root.parentModal?.borderWidth ?? 1)
             height: showFooter ? (_connectedArcAtFooter ? 76 : 36) : 0
             visible: showFooter
             clip: true