From ee33f8f07bade777e84b3727647a7d5eb89a29e5 Mon Sep 17 00:00:00 2001
From: ATMDA <atdma2600@gmail.com>
Date: Mon, 17 Nov 2025 19:44:31 -0500
Subject: controlcenter: corrected timing of network panel animations

---
 modules/controlcenter/network/EthernetPane.qml   | 16 ++++++++++++++--
 modules/controlcenter/network/NetworkingPane.qml | 20 ++++++++++++++++++--
 modules/controlcenter/network/WirelessPane.qml   | 16 ++++++++++++++--
 3 files changed, 46 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/controlcenter/network/EthernetPane.qml b/modules/controlcenter/network/EthernetPane.qml
index 05d0b1b..6a50cde 100644
--- a/modules/controlcenter/network/EthernetPane.qml
+++ b/modules/controlcenter/network/EthernetPane.qml
@@ -57,6 +57,8 @@ RowLayout {
 
                 property var pane: root.session.ethernet.active
                 property string paneId: pane ? (pane.interface || "") : ""
+                property Component targetComponent: settings
+                property Component nextComponent: settings
 
                 anchors.fill: parent
                 anchors.margins: Appearance.padding.large * 2
@@ -67,7 +69,12 @@ RowLayout {
 
                 clip: true
                 asynchronous: true
-                sourceComponent: pane ? details : settings
+                sourceComponent: loader.targetComponent
+
+                Component.onCompleted: {
+                    targetComponent = pane ? details : settings;
+                    nextComponent = targetComponent;
+                }
 
                 Behavior on paneId {
                     SequentialAnimation {
@@ -85,7 +92,11 @@ RowLayout {
                                 easing.bezierCurve: Appearance.anim.curves.standardAccel
                             }
                         }
-                        PropertyAction {}
+                        PropertyAction {
+                            target: loader
+                            property: "targetComponent"
+                            value: loader.nextComponent
+                        }
                         ParallelAnimation {
                             Anim {
                                 target: loader
@@ -104,6 +115,7 @@ RowLayout {
                 }
 
                 onPaneChanged: {
+                    nextComponent = pane ? details : settings;
                     paneId = pane ? (pane.interface || "") : "";
                 }
             }
diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 52499d8..47bb7fb 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -492,6 +492,12 @@ Item {
                     property var wirelessPane: root.session.network.active
                     property var pane: ethernetPane || wirelessPane
                     property string paneId: ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "")
+                    property Component targetComponent: settings
+                    property Component nextComponent: settings
+
+                    function getComponentForPane() {
+                        return pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings;
+                    }
 
                     anchors.fill: parent
                     anchors.margins: Appearance.padding.large * 2
@@ -502,7 +508,12 @@ Item {
                     clip: false
 
                     asynchronous: true
-                    sourceComponent: pane ? (ethernetPane ? ethernetDetails : wirelessDetails) : settings
+                    sourceComponent: loader.targetComponent
+
+                    Component.onCompleted: {
+                        targetComponent = getComponentForPane();
+                        nextComponent = targetComponent;
+                    }
 
                     Behavior on paneId {
                         SequentialAnimation {
@@ -520,7 +531,11 @@ Item {
                                     easing.bezierCurve: Appearance.anim.curves.standardAccel
                                 }
                             }
-                            PropertyAction {}
+                            PropertyAction {
+                                target: loader
+                                property: "targetComponent"
+                                value: loader.nextComponent
+                            }
                             ParallelAnimation {
                                 Anim {
                                     target: loader
@@ -539,6 +554,7 @@ Item {
                     }
 
                     onPaneChanged: {
+                        nextComponent = getComponentForPane();
                         paneId = ethernetPane ? (ethernetPane.interface || "") : (wirelessPane ? (wirelessPane.ssid || wirelessPane.bssid || "") : "");
                     }
                 }
diff --git a/modules/controlcenter/network/WirelessPane.qml b/modules/controlcenter/network/WirelessPane.qml
index 67a00f7..22364a1 100644
--- a/modules/controlcenter/network/WirelessPane.qml
+++ b/modules/controlcenter/network/WirelessPane.qml
@@ -56,6 +56,8 @@ RowLayout {
 
                 property var pane: root.session.network.active
                 property string paneId: pane ? (pane.ssid || pane.bssid || "") : ""
+                property Component targetComponent: settings
+                property Component nextComponent: settings
 
                 anchors.fill: parent
                 anchors.margins: Appearance.padding.large * 2
@@ -66,7 +68,12 @@ RowLayout {
 
                 clip: false
                 asynchronous: true
-                sourceComponent: pane ? details : settings
+                sourceComponent: loader.targetComponent
+
+                Component.onCompleted: {
+                    targetComponent = pane ? details : settings;
+                    nextComponent = targetComponent;
+                }
 
                 Behavior on paneId {
                     SequentialAnimation {
@@ -84,7 +91,11 @@ RowLayout {
                                 easing.bezierCurve: Appearance.anim.curves.standardAccel
                             }
                         }
-                        PropertyAction {}
+                        PropertyAction {
+                            target: loader
+                            property: "targetComponent"
+                            value: loader.nextComponent
+                        }
                         ParallelAnimation {
                             Anim {
                                 target: loader
@@ -103,6 +114,7 @@ RowLayout {
                 }
 
                 onPaneChanged: {
+                    nextComponent = pane ? details : settings;
                     paneId = pane ? (pane.ssid || pane.bssid || "") : "";
                 }
             }
-- 
cgit v1.2.3-freya