From bcd7f6f161ae52e725b837335019525ffc221d8f Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Thu, 30 Apr 2026 22:01:27 +1000
Subject: [PATCH] feat: display on overlay layer only when fs

---
 modules/drawers/ContentWindow.qml | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml
index d1b6ad8e..c92b78ad 100644
--- a/modules/drawers/ContentWindow.qml
+++ b/modules/drawers/ContentWindow.qml
@@ -32,11 +32,12 @@ StyledWindow {
         return monitor?.activeWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen > 1) ?? false;
     }
 
-    property real sdfBorderOffset: hasFullscreen ? 2 : 0 // SDFs joins are not exact, so offset by 2px to ensure nothing shows
-    property real borderThickness: hasFullscreen ? 0 : contentItem.Config.border.thickness
+    property real fsTransitionProg: hasFullscreen ? 1 : 0
+    readonly property real sdfBorderOffset: 2 * fsTransitionProg // SDFs joins are not exact, so offset by 2px to ensure nothing shows
+    readonly property real borderThickness: contentItem.Config.border.thickness * (1 - fsTransitionProg)
+    readonly property real borderRounding: contentItem.Config.border.rounding * (1 - fsTransitionProg)
+    readonly property real shadowOpacity: 0.7 * (1 - fsTransitionProg)
     readonly property real borderLayoutThickness: hasFullscreen ? 0 : contentItem.Config.border.thickness
-    property real borderRounding: hasFullscreen ? 0 : contentItem.Config.border.rounding
-    property real shadowOpacity: hasFullscreen ? 0 : 0.7
 
     readonly property int dragMaskPadding: {
         if (focusGrab.active || panels.popouts.isDetached)
@@ -60,7 +61,7 @@ StyledWindow {
 
     name: "drawers"
     WlrLayershell.exclusionMode: ExclusionMode.Ignore
-    WlrLayershell.layer: WlrLayer.Overlay
+    WlrLayershell.layer: fsTransitionProg > 0 ? WlrLayer.Overlay : WlrLayer.Top
     WlrLayershell.keyboardFocus: visibilities.launcher || visibilities.session || panels.dashboard.needsKeyboard ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
 
     mask: hasFullscreen ? emptyRegion : regions
@@ -70,28 +71,10 @@ StyledWindow {
     anchors.left: true
     anchors.right: true
 
-    Behavior on sdfBorderOffset {
+    Behavior on fsTransitionProg {
         Anim {}
     }
 
-    Behavior on borderThickness {
-        Anim {
-            type: Anim.DefaultSpatial
-        }
-    }
-
-    Behavior on borderRounding {
-        Anim {
-            type: Anim.DefaultSpatial
-        }
-    }
-
-    Behavior on shadowOpacity {
-        Anim {
-            type: Anim.DefaultSpatial
-        }
-    }
-
     Region {
         id: emptyRegion
     }