Removing unecessary wrapper in ScreenCorners.qml

Modules/Background/ScreenCorners.qml

@@ -6,12 +6,16 @@ import qs.Services
 import qs.Widgets
 
 NLoader {
-  id: cornerLoader
   isLoaded: Settings.data.general.showScreenCorners
-  panel: Component {
+
-    ShellRoot {
+  panel: Variants {
+    model: Quickshell.screens
+
+    PanelWindow {
       id: root
 
+      required property ShellScreen modelData
+
       // Visible ring color
       property color ringColor: Colors.backgroundPrimary
       // The amount subtracted from full size for the inner cutout
@@ -20,11 +24,12 @@ NLoader {
       // Rounded radius for the inner cutout
       property int innerRadius: 20
 
-      Variants {
+      color: "transparent"
-        model: Quickshell.screens
+      screen: modelData
-
+      WlrLayershell.exclusionMode: ExclusionMode.Ignore
-        PanelWindow {
+      WlrLayershell.namespace: "quickshell-corner"
-          required property ShellScreen modelData
+      // Do not take keyboard focus and make the surface click-through
+      WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
 
       anchors {
         top: true
@@ -32,20 +37,15 @@ NLoader {
         left: true
         right: true
       }
+
       margins {
         top: Math.round(Style.barHeight * Scaling.scale(screen))
       }
-          color: "transparent"
-          screen: modelData
-          WlrLayershell.exclusionMode: ExclusionMode.Ignore
-          WlrLayershell.namespace: "quickshell-corner"
-          // Do not take keyboard focus and make the surface click-through
-          WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
-          mask: Region {}
 
       // Source we want to show only as a ring
       Rectangle {
         id: overlaySource
+
         anchors.fill: parent
         color: root.ringColor
       }
@@ -53,6 +53,7 @@ NLoader {
       // Texture for overlaySource
       ShaderEffectSource {
         id: overlayTexture
+
         anchors.fill: parent
         sourceItem: overlaySource
         hideSource: true
@@ -63,6 +64,7 @@ NLoader {
       // Mask via Canvas: paint opaque white, then punch rounded inner hole
       Canvas {
         id: maskSource
+
         anchors.fill: parent
         antialiasing: true
         renderTarget: Canvas.FramebufferObject
@@ -74,15 +76,12 @@ NLoader {
           ctx.globalCompositeOperation = "source-over"
           ctx.fillStyle = "#ffffffff"
           ctx.fillRect(0, 0, width, height)
-
           // Punch hole using destination-out with rounded rect path
           const x = Math.round(root.borderWidth / 2)
           const y = Math.round(root.borderWidth / 2)
           const w = Math.max(0, width - root.borderWidth)
           const h = Math.max(0, height - root.borderWidth)
-              const r = Math.max(0, Math.min(root.innerRadius,
+          const r = Math.max(0, Math.min(root.innerRadius, Math.min(w, h) / 2))
-                                             Math.min(w, h) / 2))
-
           ctx.globalCompositeOperation = "destination-out"
           ctx.fillStyle = "#ffffffff"
           ctx.beginPath()
@@ -105,19 +104,23 @@ NLoader {
 
       // Repaint mask when properties change
       Connections {
-            target: root
         function onBorderWidthChanged() {
           maskSource.requestPaint()
         }
-            function onRingColorChanged() {/* no-op for mask */ }
+
+        function onRingColorChanged() {}
+
         function onInnerRadiusChanged() {
           maskSource.requestPaint()
         }
+
+        target: root
       }
 
       // Texture for maskSource; hides the original
       ShaderEffectSource {
         id: maskTexture
+
         anchors.fill: parent
         sourceItem: maskSource
         hideSource: true
@@ -133,8 +136,8 @@ NLoader {
         maskSource: maskTexture
         maskInverted: false
       }
-        }
+
-      }
+      mask: Region {}
     }
   }
 }

shell.qml

@@ -1,4 +1,3 @@
-
 // Disable reload popup
 //@ pragma Env QS_NO_RELOAD_POPUP=1
 import QtQuick