From 108821b2fe7b0f11977329c5b6eb19de82b09570 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sun, 7 Jun 2026 00:42:59 +1000 Subject: [PATCH] fix: nexus network sorting order Also push connecting and saved networks up And display whether a network is saved --- modules/nexus/pages/NetworkPage.qml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/nexus/pages/NetworkPage.qml b/modules/nexus/pages/NetworkPage.qml index c6cbd6ac..9b8f7b50 100644 --- a/modules/nexus/pages/NetworkPage.qml +++ b/modules/nexus/pages/NetworkPage.qml @@ -69,13 +69,12 @@ PageBase { list.anchors.top: scanningIndicator.bottom model: ScriptModel { - values: [...Nmcli.networks].sort((a, b) => { - if (a.active) - return -1; - if (b.active) - return 1; - return b.strength - a.strength; - }) + values: { + const connecting = Nmcli.connectingSsid(); + // Lower rank sorts higher in the list + const rank = n => n.active ? 0 : n.ssid === connecting ? 1 : Nmcli.hasSavedProfile(n.ssid) ? 2 : 3; + return [...Nmcli.networks].sort((a, b) => rank(a) - rank(b) || b.strength - a.strength); + } } delegate: StateLayer { @@ -155,7 +154,7 @@ PageBase { StyledText { Layout.fillWidth: true - text: qsTr("Security: %1").arg(network.modelData.security) + text: qsTr("Security: %1%2").arg(network.modelData.security).arg(Nmcli.hasSavedProfile(network.modelData.ssid) ? qsTr(" • Saved") : "") color: Colours.tPalette.m3outline font: Tokens.font.label.small elide: Text.ElideRight