From f662717c0ab9a2a23fde199fb0bc79207fb641e8 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 23 Aug 2025 23:11:08 +1000
Subject: popouts/network: better rescan loading

---
 modules/bar/popouts/Network.qml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'modules/bar/popouts')

diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml
index 966823e..35146aa 100644
--- a/modules/bar/popouts/Network.qml
+++ b/modules/bar/popouts/Network.qml
@@ -146,11 +146,11 @@ ColumnLayout {
         Layout.fillWidth: true
         implicitHeight: rescanBtn.implicitHeight + Appearance.padding.small * 2
 
-        radius: Appearance.rounding.normal
-        color: Network.scanning ? Colours.tPalette.m3surfaceContainer : Colours.palette.m3primaryContainer
+        radius: Appearance.rounding.full
+        color: Colours.palette.m3primaryContainer
 
         StateLayer {
-            color: Network.scanning ? Colours.palette.m3onSurface : Colours.palette.m3onPrimaryContainer
+            color: Colours.palette.m3onPrimaryContainer
             disabled: Network.scanning || !Network.wifiEnabled
 
             function onClicked(): void {
@@ -160,29 +160,35 @@ ColumnLayout {
 
         RowLayout {
             id: rescanBtn
+
             anchors.centerIn: parent
             spacing: Appearance.spacing.small
+            opacity: Network.scanning ? 0 : 1
 
             MaterialIcon {
                 id: scanIcon
 
                 animate: true
-                text: Network.scanning ? "refresh" : "wifi_find"
-                color: Network.scanning ? Colours.palette.m3onSurface : Colours.palette.m3onPrimaryContainer
-
-                RotationAnimation on rotation {
-                    running: Network.scanning
-                    loops: Animation.Infinite
-                    from: 0
-                    to: 360
-                    duration: 1000
-                }
+                text: "wifi_find"
+                color: Colours.palette.m3onPrimaryContainer
             }
 
             StyledText {
-                text: Network.scanning ? qsTr("Scanning...") : qsTr("Rescan networks")
-                color: Network.scanning ? Colours.palette.m3onSurface : Colours.palette.m3onPrimaryContainer
+                text: qsTr("Rescan networks")
+                color: Colours.palette.m3onPrimaryContainer
             }
+
+            Behavior on opacity {
+                Anim {}
+            }
+        }
+
+        StyledBusyIndicator {
+            anchors.centerIn: parent
+            strokeWidth: Appearance.padding.small / 2
+            bgColour: "transparent"
+            implicitHeight: parent.implicitHeight - Appearance.padding.smaller * 2
+            running: Network.scanning
         }
     }
 
-- 
cgit v1.2.3-freya