Refactor connected chrome rendering & remove legacy components

quickshell/Common/ConnectedModeState.qml

@@ -74,10 +74,6 @@ Singleton {
         }, descriptor);
     }
 
-    function legacySurfaceState(screenName, kind) {
-        return SurfaceDescriptor.toLegacyState(surfaceDescriptor(screenName, kind));
-    }
-
     function hasSurfaceDescriptor(screenName, kind, ownerId) {
         const descriptor = surfaceDescriptor(screenName, kind);
         return descriptor.phase !== "hidden" && (!ownerId || descriptor.ownerId === ownerId);
@@ -124,20 +120,6 @@ Singleton {
         return true;
     }
 
-    function _setSurfaceAnimation(screenName, kind, ownerId, x, y) {
-        const current = surfaceDescriptor(screenName, kind);
-        if (current.phase === "hidden" || (ownerId && current.ownerId !== ownerId))
-            return false;
-        return true;
-    }
-
-    function _setSurfaceBody(screenName, kind, ownerId, x, y, width, height) {
-        const current = surfaceDescriptor(screenName, kind);
-        if (current.phase === "hidden" || (ownerId && current.ownerId !== ownerId))
-            return false;
-        return true;
-    }
-
     readonly property var emptyDockState: ({
             "reveal": false,
             "barSide": "bottom",
@@ -289,7 +271,6 @@ Singleton {
             if (!isNaN(nextY) && popoutAnimY !== nextY)
                 popoutAnimY = nextY;
         }
-        _setSurfaceAnimation(popoutScreen, "popout", claimId, animX, animY);
         return true;
     }
 
@@ -316,7 +297,6 @@ Singleton {
             if (!isNaN(nextH) && popoutBodyH !== nextH)
                 popoutBodyH = nextH;
         }
-        _setSurfaceBody(popoutScreen, "popout", claimId, bodyX, bodyY, bodyW, bodyH);
         return true;
     }
 
@@ -352,8 +332,8 @@ Singleton {
             "phase": normalized.reveal ? (state.phase || "open") : "hidden"
         });
         const previous = dockStates[screenName] || emptyDockState;
-        const legacyChanged = !_sameDockState(dockStates[screenName], normalized);
-        if (legacyChanged) {
+        const stateChanged = !_sameDockState(dockStates[screenName], normalized);
+        if (stateChanged) {
             const next = _cloneDict(dockStates);
             next[screenName] = normalized;
             dockStates = next;
@@ -397,7 +377,6 @@ Singleton {
             "y": numY
         };
         dockSlides = next;
-        _setSurfaceAnimation(screenName, "dock", "dock:" + screenName, numX, numY);
         return true;
     }
 
@@ -451,8 +430,8 @@ Singleton {
             "phase": normalized.visible ? (state.phase || "open") : "hidden"
         });
         const previous = notificationStates[screenName] || emptyNotificationState;
-        const legacyChanged = !_sameNotificationState(notificationStates[screenName], normalized);
-        if (legacyChanged) {
+        const stateChanged = !_sameNotificationState(notificationStates[screenName], normalized);
+        if (stateChanged) {
             const next = _cloneDict(notificationStates);
             next[screenName] = normalized;
             notificationStates = next;
@@ -573,10 +552,6 @@ Singleton {
         return updateModalState(screenName, state, ownerId);
     }
 
-    function setModalState(screenName, state) {
-        return updateModalState(screenName, state, null);
-    }
-
     function clearModalState(screenName, ownerId) {
         if (!screenName)
             return false;
@@ -617,7 +592,6 @@ Singleton {
             "animY": nay
         });
         modalStates = next;
-        _setSurfaceAnimation(screenName, "modal", ownerId, animX, animY);
         return true;
     }
 
@@ -641,7 +615,6 @@ Singleton {
             "bodyH": nh
         });
         modalStates = next;
-        _setSurfaceBody(screenName, "modal", ownerId, bodyX, bodyY, bodyW, bodyH);
         return true;
     }
 

quickshell/Common/ConnectedSurfaceDescriptor.js

@@ -157,23 +157,3 @@ function same(a, b, threshold) {
         && a.omitEndConnector === b.omitEndConnector
         && a.dockRetractSide === b.dockRetractSide;
 }
-
-function toLegacyState(descriptor) {
-    var d = normalize(descriptor);
-    return {
-        "visible": d.visible,
-        "reveal": d.visible,
-        "barSide": d.barSide,
-        "bodyX": d.bodyRect.x,
-        "bodyY": d.bodyRect.y,
-        "bodyW": d.bodyRect.width,
-        "bodyH": d.bodyRect.height,
-        "animX": d.animationOffset.x,
-        "animY": d.animationOffset.y,
-        "slideX": d.animationOffset.x,
-        "slideY": d.animationOffset.y,
-        "screen": d.screenName,
-        "omitStartConnector": d.omitStartConnector,
-        "omitEndConnector": d.omitEndConnector
-    };
-}