never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: wifi for dual ssids (#27)

Browse source
This commit is contained in:
ferrreo 2025-07-18 20:43:42 +01:00 • committed by GitHub
parent 17552b7a8b
commit 828f98b58e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Widgets/Sidebar/Panel/BluetoothPanel.qml
View file

@ -148,7 +148,7 @@ Item {
// Content area (centered, in a card) // Content area (centered, in a card)
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 520 Layout.preferredHeight: 640
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.margins: 0 Layout.margins: 0
color: Theme.surfaceVariant color: Theme.surfaceVariant

48
Widgets/Sidebar/Panel/WifiPanel.qml
View file

@ -45,9 +45,28 @@ Item {
var security = parts[1]; var security = parts[1];
var signal = parseInt(parts[2]); var signal = parseInt(parts[2]);
var inUse = parts[3] === "*"; var inUse = parts[3] === "*";
if (ssid && !seen[ssid]) { if (ssid) {
nets.push({ ssid: ssid, security: security, signal: signal, connected: inUse }); if (!seen[ssid]) {
seen[ssid] = true; // First time seeing this SSID
nets.push({ ssid: ssid, security: security, signal: signal, connected: inUse });
seen[ssid] = true;
} else {
// SSID already exists, update if this entry has better signal or is connected
for (var j = 0; j < nets.length; ++j) {
if (nets[j].ssid === ssid) {
// Update connection status if this entry is connected
if (inUse) {
nets[j].connected = true;
}
// Update signal if this entry has better signal
if (signal > nets[j].signal) {
nets[j].signal = signal;
nets[j].security = security;
}
break;
}
}
}
} }
} }
wifiLogic.networks = nets; wifiLogic.networks = nets;
@ -402,7 +421,7 @@ Item {
} }
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 520 Layout.preferredHeight: 640
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.margins: 0 Layout.margins: 0
color: Theme.surfaceVariant color: Theme.surfaceVariant
@ -448,7 +467,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 42 Layout.preferredHeight: 42
radius: 8 radius: 8
color: modelData.connected ? Qt.rgba(Theme.accentPrimary.r, Theme.accentPrimary.g, Theme.accentPrimary.b, 0.18) : (networkMouseArea.containsMouse || (modelData.ssid === wifiLogic.passwordPromptSsid && wifiLogic.showPasswordPrompt) ? Theme.highlight : "transparent") color: modelData.connected ? Qt.rgba(Theme.accentPrimary.r, Theme.accentPrimary.g, Theme.accentPrimary.b, 0.44) : (networkMouseArea.containsMouse || (modelData.ssid === wifiLogic.passwordPromptSsid && wifiLogic.showPasswordPrompt) ? Theme.highlight : "transparent")
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 12 anchors.leftMargin: 12
@ -500,13 +519,6 @@ Item {
} }
} }
} }
Spinner {
visible: wifiLogic.connectingSsid === modelData.ssid
running: wifiLogic.connectingSsid === modelData.ssid
color: Theme.textPrimary
size: 18
}
} }
Text { Text {
text: modelData.security && modelData.security !== "--" ? modelData.security : "Open" text: modelData.security && modelData.security !== "--" ? modelData.security : "Open"
@ -534,6 +546,18 @@ Item {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
Item {
Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: 22
Layout.preferredWidth: 22
Spinner {
visible: wifiLogic.connectingSsid === modelData.ssid
running: wifiLogic.connectingSsid === modelData.ssid
color: Theme.accentPrimary
anchors.centerIn: parent
size: 22
}
}
} }
MouseArea { MouseArea {
id: networkMouseArea id: networkMouseArea