Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

network applet: fixes to # of visible networks #12417

Merged
merged 2 commits into from
Nov 25, 2024
Merged

network applet: fixes to # of visible networks #12417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d89551
network applet: fix accounting of menu indexes
jknockel Sep 26, 2024
bc8baf8
network applet: keep visible networks under limit
jknockel Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,10 @@ NMDevice.prototype = {
for(let j = 0; j < this._connections.length; ++j) {
let obj = this._connections[j];
if (this._activeConnection &&
obj.connection == this._activeConnection.connection)
obj.connection == this._activeConnection.connection) {
activeOffset = 0; // we no longer need to account for this
continue;
}
obj.item = this._createConnectionItem(obj);

if (j + activeOffset >= NUM_VISIBLE_NETWORKS) {
Expand Down Expand Up @@ -1383,8 +1385,7 @@ NMDeviceWireless.prototype = {
}

if (needsupdate) {
if (apObj.item)
apObj.item.destroy();
this._accessPointRemoved(device, accessPoint);

if (pos != -1)
this._networks.splice(pos, 1);
Expand All @@ -1398,7 +1399,7 @@ NMDeviceWireless.prototype = {
}

// skip networks that should appear earlier
let menuPos = 0;
let menuPos = this._activeConnectionItem ? 1 : 0;
for (pos = 0;
pos < this._networks.length &&
this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) {
Expand All @@ -1410,8 +1411,20 @@ NMDeviceWireless.prototype = {
this._networks.splice(pos, 0, apObj);

if (this._shouldShowConnectionList()) {
menuPos += (this._activeConnectionItem ? 1 : 0);
this._createNetworkItem(apObj, menuPos);
if (menuPos < NUM_VISIBLE_NETWORKS && this._networks.length > NUM_VISIBLE_NETWORKS) {
for (; menuPos < NUM_VISIBLE_NETWORKS; ++pos) {
if (this._networks[pos] != this._activeNetwork)
menuPos++;
}
let item = this._networks[pos].item;
if (item && item._apObj) {
item.destroy();
item._apObj.item = null;

this._createNetworkItem(item._apObj, NUM_VISIBLE_NETWORKS);
}
}
}
}
},
Expand Down Expand Up @@ -1703,8 +1716,10 @@ NMDeviceWireless.prototype = {

for(let j = 0; j < this._networks.length; j++) {
let apObj = this._networks[j];
if (apObj == this._activeNetwork)
if (apObj == this._activeNetwork) {
activeOffset = 0; // we no longer need to account for this
continue;
}

this._createNetworkItem(apObj, j + activeOffset);
}
Expand Down
Loading