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

panel: Add extension hook to add quick settings items

Browse Source 
Quick Settings has become a popular extension point, but adding
items anywhere but the end has become harder since the indicator
setup was made async.

Address this with an addExternalIndicator() method that adds
indicator and quick settings items at reasonable positions.

At the same time, adjust the indicator setup to take eventually
added external items into account.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2894>
This commit is contained in:
Florian Müllner 2023-08-10 17:38:38 +02:00
parent 96bf9e700f
commit 93b89ce0c5
1 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
js/ui/panel.js
View File

@ -554,10 +554,14 @@ class QuickSettings extends PanelMenu.Button {
this._unsafeMode = new UnsafeModeIndicator(); this._unsafeMode = new UnsafeModeIndicator();
this._backgroundApps = new BackgroundAppsStatus.Indicator(); this._backgroundApps = new BackgroundAppsStatus.Indicator();
this._indicators.add_child(this._remoteAccess); // add privacy-related indicators before any external indicators
this._indicators.add_child(this._camera); let pos = 0;
this._indicators.add_child(this._volumeInput); this._indicators.insert_child_at_index(this._remoteAccess, pos++);
this._indicators.add_child(this._location); this._indicators.insert_child_at_index(this._camera, pos++);
this._indicators.insert_child_at_index(this._volumeInput, pos++);
this._indicators.insert_child_at_index(this._location, pos++);
// append all other indicators
this._indicators.add_child(this._brightness); this._indicators.add_child(this._brightness);
this._indicators.add_child(this._thunderbolt); this._indicators.add_child(this._thunderbolt);
this._indicators.add_child(this._nightLight); this._indicators.add_child(this._nightLight);
@ -574,32 +578,57 @@ class QuickSettings extends PanelMenu.Button {
this._indicators.add_child(this._unsafeMode); this._indicators.add_child(this._unsafeMode);
this._indicators.add_child(this._system); this._indicators.add_child(this._system);
this._addItems(this._system.quickSettingsItems, N_QUICK_SETTINGS_COLUMNS); // add our quick settings items before any external ones
this._addItems(this._volumeOutput.quickSettingsItems, N_QUICK_SETTINGS_COLUMNS); const sibling = this.menu.getFirstItem();
this._addItems(this._volumeInput.quickSettingsItems, N_QUICK_SETTINGS_COLUMNS); this._addItemsBefore(this._system.quickSettingsItems,
this._addItems(this._brightness.quickSettingsItems, N_QUICK_SETTINGS_COLUMNS); sibling, N_QUICK_SETTINGS_COLUMNS);
this._addItemsBefore(this._volumeOutput.quickSettingsItems,
sibling, N_QUICK_SETTINGS_COLUMNS);
this._addItemsBefore(this._volumeInput.quickSettingsItems,
sibling, N_QUICK_SETTINGS_COLUMNS);
this._addItemsBefore(this._brightness.quickSettingsItems,
sibling, N_QUICK_SETTINGS_COLUMNS);
this._addItems(this._camera.quickSettingsItems); this._addItemsBefore(this._camera.quickSettingsItems, sibling);
this._addItems(this._remoteAccess.quickSettingsItems); this._addItemsBefore(this._remoteAccess.quickSettingsItems, sibling);
this._addItems(this._thunderbolt.quickSettingsItems); this._addItemsBefore(this._thunderbolt.quickSettingsItems, sibling);
this._addItems(this._location.quickSettingsItems); this._addItemsBefore(this._location.quickSettingsItems, sibling);
if (this._network) if (this._network)
this._addItems(this._network.quickSettingsItems); this._addItemsBefore(this._network.quickSettingsItems, sibling);
if (this._bluetooth) if (this._bluetooth)
this._addItems(this._bluetooth.quickSettingsItems); this._addItemsBefore(this._bluetooth.quickSettingsItems, sibling);
this._addItems(this._powerProfiles.quickSettingsItems); this._addItemsBefore(this._powerProfiles.quickSettingsItems, sibling);
this._addItems(this._nightLight.quickSettingsItems); this._addItemsBefore(this._nightLight.quickSettingsItems, sibling);
this._addItems(this._darkMode.quickSettingsItems); this._addItemsBefore(this._darkMode.quickSettingsItems, sibling);
this._addItems(this._backlight.quickSettingsItems); this._addItemsBefore(this._backlight.quickSettingsItems, sibling);
this._addItems(this._rfkill.quickSettingsItems); this._addItemsBefore(this._rfkill.quickSettingsItems, sibling);
this._addItems(this._autoRotate.quickSettingsItems); this._addItemsBefore(this._autoRotate.quickSettingsItems, sibling);
this._addItems(this._unsafeMode.quickSettingsItems); this._addItemsBefore(this._unsafeMode.quickSettingsItems, sibling);
this._addItems(this._backgroundApps.quickSettingsItems, N_QUICK_SETTINGS_COLUMNS); // append background apps
this._backgroundApps.quickSettingsItems.forEach(
item => this.menu.addItem(item, N_QUICK_SETTINGS_COLUMNS));
} }
_addItems(items, colSpan = 1) { _addItemsBefore(items, sibling, colSpan = 1) {
items.forEach(item => this.menu.addItem(item, colSpan)); items.forEach(item => this.menu.insertItemBefore(item, sibling, colSpan));
}
/**
* Insert indicator and quick settings items at
* appropriate positions
*
* @param {PanelMenu.Button} indicator
* @param {number=} colSpan
*/
addExternalIndicator(indicator, colSpan = 1) {
// Insert before first non-privacy indicator if it exists
let sibling = this._brightness ?? null;
this._indicators.insert_child_below(indicator, sibling);
// Insert before background apps if it exists
sibling = this._backgroundApps?.quickSettingsItems?.at(-1) ?? null;
this._addItemsBefore(indicator.quickSettingsItems, sibling, colSpan);
} }
}); });