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

popupMenu: Only connect to notify::key-focus when needed

Browse Source 
PopupMenuManager was connecting to notify::key-focus on the stage on
construction, but only ever reacting to it when one of its menus was
open. Given that every single app icon and text entry creates a
PopupMenuManager this was causing a lot of these handlers to be created.
Every single handler meant calling into JS code only for the vast
majority of them to determine that they would not do anything.

Additionally these handlers were leaked for the whole lifetime of the
stage due to never getting disconnected.

This now only connects the handler when a menu is open and disconnects
again when it is closed, significantly reducing the number of active
handlers at a time.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7143
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3001>
This commit is contained in:
Sebastian Keller 2023-10-30 11:18:25 +01:00 committed by Marge Bot
parent c032bb62a5
commit f1b7af2ab0
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/ui/popupMenu.js
View File

@ -1276,16 +1276,6 @@ export class PopupMenuManager {
constructor(owner, grabParams) {
this._grabParams = Params.parse(grabParams,
{actionMode: Shell.ActionMode.POPUP});
global.stage.connect('notify::key-focus', () => {
if (!this.activeMenu)
return;
let actor = global.stage.get_key_focus();
let newMenu = this._findMenuForSource(actor);
if (newMenu)
this._changeMenu(newMenu);
});
this._menus = [];
}
@ -1309,6 +1299,11 @@ export class PopupMenuManager {
if (menu === this.activeMenu) {
Main.popModal(this._grab);
this._grab = null;
if (this._keyFocusId) {
global.stage.disconnect(this._keyFocusId);
delete this._keyFocusId;
}
}
const position = this._menus.indexOf(menu);
@ -1336,10 +1331,29 @@ export class PopupMenuManager {
oldMenu?.close(BoxPointer.PopupAnimation.FADE);
if (oldGrab)
Main.popModal(oldGrab);
if (!this._keyFocusId) {
this._keyFocusId =
global.stage.connect('notify::key-focus', () => {
if (!this.activeMenu)
return;
let actor = global.stage.get_key_focus();
let newMenu = this._findMenuForSource(actor);
if (newMenu)
this._changeMenu(newMenu);
});
}
} else if (this.activeMenu === menu) {
this.activeMenu = null;
Main.popModal(this._grab);
this._grab = null;
if (this._keyFocusId) {
global.stage.disconnect(this._keyFocusId);
delete this._keyFocusId;
}
}
}