brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status/network: Sort items, not connections

Browse Source 
You could argue that the item name is closer to what is displayed
to the user, but it doesn't really matter: Connection items will
always use the connection ID when there is more than one, which
is the only case where sorting matters.

However sorting by items will allow us to generalize the code, and
use it for items that do not represent a connection.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2407>
This commit is contained in:
Florian Müllner 2022-08-06 16:15:07 +02:00 committed by Marge Bot
parent a62ac495a3
commit be950d5c4a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/ui/status/network.js
View File

@ -265,7 +265,7 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
this._client = client; this._client = client;
this._connectionItems = new Map(); this._connectionItems = new Map();
this._connections = []; this._itemsOrder = [];
this._section = new PopupMenu.PopupMenuSection(); this._section = new PopupMenu.PopupMenuSection();
@ -306,8 +306,8 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
return true; return true;
} }
_connectionSortFunction(one, two) { _itemSortFunction(one, two) {
return GLib.utf8_collate(one.get_id(), two.get_id()); return GLib.utf8_collate(one.name, two.name);
} }
_makeConnectionItem(connection) { _makeConnectionItem(connection) {
@ -335,13 +335,13 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
} }
_updateForConnection(item, connection) { _updateForConnection(item, connection) {
let pos = this._connections.indexOf(connection);
this._connections.splice(pos, 1);
pos = Util.insertSorted(this._connections, connection, this._connectionSortFunction.bind(this));
this._section.moveMenuItem(item, pos);
item.updateForConnection(connection); item.updateForConnection(connection);
let pos = this._itemsOrder.indexOf(item);
this._itemsOrder.splice(pos, 1);
pos = Util.insertSorted(this._itemsOrder, item, this._itemSortFunction.bind(this));
this._section.moveMenuItem(item, pos);
} }
_addConnection(connection) { _addConnection(connection) {
@ -353,7 +353,7 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
item.connect('activation-failed', () => this.emit('activation-failed')); item.connect('activation-failed', () => this.emit('activation-failed'));
item.connect('notify::name', this._sync.bind(this)); item.connect('notify::name', this._sync.bind(this));
let pos = Util.insertSorted(this._connections, connection, this._connectionSortFunction.bind(this)); let pos = Util.insertSorted(this._itemsOrder, item, this._itemSortFunction.bind(this));
this._section.addMenuItem(item, pos); this._section.addMenuItem(item, pos);
this._connectionItems.set(connection.get_uuid(), item); this._connectionItems.set(connection.get_uuid(), item);
this._sync(); this._sync();
@ -365,12 +365,12 @@ var NMConnectionSection = class NMConnectionSection extends Signals.EventEmitter
if (item == undefined) if (item == undefined)
return; return;
const pos = this._itemsOrder.indexOf(item);
this._itemsOrder.splice(pos, 1);
item.destroy(); item.destroy();
this._connectionItems.delete(uuid); this._connectionItems.delete(uuid);
let pos = this._connections.indexOf(connection);
this._connections.splice(pos, 1);
this._sync(); this._sync();
} }
}; };