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

popupMenu: Query stage for target actor instead of event.get_source()

Browse Source 
Events are going to stop containing the destinatary, so stop using this
API. Querying the stage is equivalent and ensured to be up-to-date.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2216>
This commit is contained in:
Carlos Garnacho 2022-02-25 13:09:33 +01:00 committed by Marge Bot
parent 678e34d371
commit 17730fe5c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/popupMenu.js
View File

@ -1396,6 +1396,8 @@ var PopupMenuManager = class {
_onCapturedEvent(actor, event) { _onCapturedEvent(actor, event) {
let menu = actor._delegate; let menu = actor._delegate;
const targetActor = global.stage.get_event_actor(event);
if (event.type() === Clutter.EventType.KEY_PRESS) { if (event.type() === Clutter.EventType.KEY_PRESS) {
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
if (symbol === Clutter.KEY_Down && if (symbol === Clutter.KEY_Down &&
@ -1408,13 +1410,13 @@ var PopupMenuManager = class {
} }
} else if (event.type() === Clutter.EventType.ENTER && } else if (event.type() === Clutter.EventType.ENTER &&
(event.get_flags() & Clutter.EventFlags.GRAB_NOTIFY) === 0) { (event.get_flags() & Clutter.EventFlags.GRAB_NOTIFY) === 0) {
let hoveredMenu = this._findMenuForSource(event.get_source()); let hoveredMenu = this._findMenuForSource(targetActor);
if (hoveredMenu && hoveredMenu !== menu) if (hoveredMenu && hoveredMenu !== menu)
this._changeMenu(hoveredMenu); this._changeMenu(hoveredMenu);
} else if ((event.type() === Clutter.EventType.BUTTON_PRESS || } else if ((event.type() === Clutter.EventType.BUTTON_PRESS ||
event.type() === Clutter.EventType.TOUCH_BEGIN) && event.type() === Clutter.EventType.TOUCH_BEGIN) &&
!actor.contains(event.get_source())) { !actor.contains(targetActor)) {
menu.close(BoxPointer.PopupAnimation.FULL); menu.close(BoxPointer.PopupAnimation.FULL);
} }