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

status/powerProfiles: Split updating profiles from sync

Browse Source 
Calling the split out code where necessary seems cleaner than
calling it conditionally as part of the general sync().

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2389>
This commit is contained in:
Florian Müllner 2022-07-22 18:46:09 +02:00 committed by Marge Bot
parent 9e40e14c34
commit d03a94dab1
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/ui/status/powerProfiles.js
View File

@ -32,7 +32,6 @@ class Indicator extends PanelMenu.SystemIndicator {
super._init(); super._init();
this._profileItems = new Map(); this._profileItems = new Map();
this._updateProfiles = true;
this._proxy = new PowerProfilesProxy(Gio.DBus.system, BUS_NAME, OBJECT_PATH, this._proxy = new PowerProfilesProxy(Gio.DBus.system, BUS_NAME, OBJECT_PATH,
(proxy, error) => { (proxy, error) => {
@ -42,9 +41,11 @@ class Indicator extends PanelMenu.SystemIndicator {
this._proxy.connect('g-properties-changed', this._proxy.connect('g-properties-changed',
(p, properties) => { (p, properties) => {
const propertyNames = properties.deep_unpack(); const propertyNames = properties.deep_unpack();
this._updateProfiles = 'Profiles' in propertyNames; if ('Profiles' in propertyNames)
this._syncProfiles();
this._sync(); this._sync();
}); });
this._syncProfiles();
} }
this._sync(); this._sync();
}); });
@ -68,33 +69,32 @@ class Indicator extends PanelMenu.SystemIndicator {
this.menu.setSensitive(sensitive); this.menu.setSensitive(sensitive);
} }
_syncProfiles() {
this._profileSection.removeAll();
this._profileItems.clear();
const profiles = this._proxy.Profiles
.map(p => p.Profile.unpack())
.reverse();
for (const profile of profiles) {
const label = PROFILE_LABELS[profile];
if (!label)
continue;
const item = new PopupMenu.PopupMenuItem(label);
item.connect('activate',
() => (this._proxy.ActiveProfile = profile));
this._profileItems.set(profile, item);
this._profileSection.addMenuItem(item);
}
}
_sync() { _sync() {
this._item.visible = this._proxy.g_name_owner !== null; this._item.visible = this._proxy.g_name_owner !== null;
if (!this._item.visible) if (!this._item.visible)
return; return;
if (this._updateProfiles) {
this._profileSection.removeAll();
this._profileItems.clear();
const profiles = this._proxy.Profiles
.map(p => p.Profile.unpack())
.reverse();
for (const profile of profiles) {
const label = PROFILE_LABELS[profile];
if (!label)
continue;
const item = new PopupMenu.PopupMenuItem(label);
item.connect('activate',
() => (this._proxy.ActiveProfile = profile));
this._profileItems.set(profile, item);
this._profileSection.addMenuItem(item);
}
this._updateProfiles = false;
}
for (const [profile, item] of this._profileItems) { for (const [profile, item] of this._profileItems) {
item.setOrnament(profile === this._proxy.ActiveProfile item.setOrnament(profile === this._proxy.ActiveProfile
? PopupMenu.Ornament.DOT ? PopupMenu.Ornament.DOT