screen corners: not have a fullscreen layer

.config/quickshell/ii/modules/screenCorners/ScreenCorners.qml

@@ -11,63 +11,56 @@ Scope {
     id: screenCorners
     readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
 
+    component CornerPanelWindow: PanelWindow {
+        id: cornerPanelWindow
+        visible: (Config.options.appearance.fakeScreenRounding === 1 || (Config.options.appearance.fakeScreenRounding === 2 && !activeWindow?.fullscreen))
+        property var corner
+
+        exclusionMode: ExclusionMode.Ignore
+        mask: Region {
+            item: null
+        }
+        WlrLayershell.namespace: "quickshell:screenCorners"
+        WlrLayershell.layer: WlrLayer.Overlay
+        color: "transparent"
+
+        anchors {
+            top: cornerPanelWindow.corner === RoundCorner.CornerEnum.TopLeft || cornerPanelWindow.corner === RoundCorner.CornerEnum.TopRight
+            left: cornerPanelWindow.corner === RoundCorner.CornerEnum.TopLeft || cornerPanelWindow.corner === RoundCorner.CornerEnum.BottomLeft
+            bottom: cornerPanelWindow.corner === RoundCorner.CornerEnum.BottomLeft || cornerPanelWindow.corner === RoundCorner.CornerEnum.BottomRight
+            right: cornerPanelWindow.corner === RoundCorner.CornerEnum.TopRight || cornerPanelWindow.corner === RoundCorner.CornerEnum.BottomRight
+        }
+
+        implicitWidth: cornerWidget.implicitWidth
+        implicitHeight: cornerWidget.implicitHeight
+        RoundCorner {
+            id: cornerWidget
+            size: Appearance.rounding.screenRounding
+            corner: cornerPanelWindow.corner
+        }
+    }
+
     Variants {
         model: Quickshell.screens
 
-        PanelWindow {
+        Scope {
-            visible: (Config.options.appearance.fakeScreenRounding === 1 
+            required property var modelData
-                || (Config.options.appearance.fakeScreenRounding === 2 
+            CornerPanelWindow {
-                    && !activeWindow?.fullscreen))
+                screen: modelData
-
-            property var modelData
-
-            screen: modelData
-            exclusionMode: ExclusionMode.Ignore
-            mask: Region {
-                item: null
-            }
-            WlrLayershell.namespace: "quickshell:screenCorners"
-            WlrLayershell.layer: WlrLayer.Overlay
-            color: "transparent"
-
-            anchors {
-                top: true
-                left: true
-                right: true
-                bottom: true
-            }
-
-            RoundCorner {
-                id: topLeftCorner
-                anchors.top: parent.top
-                anchors.left: parent.left
-                size: Appearance.rounding.screenRounding
                 corner: RoundCorner.CornerEnum.TopLeft
             }
-            RoundCorner {
+            CornerPanelWindow {
-                id: topRightCorner
+                screen: modelData
-                anchors.top: parent.top
-                anchors.right: parent.right
-                size: Appearance.rounding.screenRounding
                 corner: RoundCorner.CornerEnum.TopRight
             }
-            RoundCorner {
+            CornerPanelWindow {
-                id: bottomLeftCorner
+                screen: modelData
-                anchors.bottom: parent.bottom
-                anchors.left: parent.left
-                size: Appearance.rounding.screenRounding
                 corner: RoundCorner.CornerEnum.BottomLeft
             }
-            RoundCorner {
+            CornerPanelWindow {
-                id: bottomRightCorner
+                screen: modelData
-                anchors.bottom: parent.bottom
-                anchors.right: parent.right
-                size: Appearance.rounding.screenRounding
                 corner: RoundCorner.CornerEnum.BottomRight
             }
-
         }
-
     }
-
 }