edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-18 07:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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>
(cherry picked from commit f1b7af2ab0)
This commit is contained in:
Sebastian Keller 2023-10-30 11:18:25 +01:00 • committed by Florian Müllner
parent fe45754550
commit 5f8210de5d
1 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
js/ui/popupMenu.js
View file

@ -1296,16 +1296,6 @@ var PopupMenuManager = class {
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 = [];
}
@ -1329,6 +1319,11 @@ var PopupMenuManager = class {
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);
@ -1356,10 +1351,29 @@ var PopupMenuManager = class {
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;
}
}
}