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

keyboard: 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:17 +01:00 committed by Marge Bot
parent 4a8b8e6dd5
commit 678e34d371
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/ui/keyboard.js
View File

@ -259,8 +259,10 @@ var LanguageSelectionPopup = class extends PopupMenu.PopupMenu {
} }
_onCapturedEvent(actor, event) { _onCapturedEvent(actor, event) {
if (event.get_source() == this.actor || const targetActor = global.stage.get_event_actor(event);
this.actor.contains(event.get_source()))
if (targetActor === this.actor ||
this.actor.contains(targetActor))
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
if (event.type() == Clutter.EventType.BUTTON_RELEASE || event.type() == Clutter.EventType.TOUCH_END) if (event.type() == Clutter.EventType.BUTTON_RELEASE || event.type() == Clutter.EventType.TOUCH_END)
@ -407,9 +409,10 @@ var Key = GObject.registerClass({
let type = event.type(); let type = event.type();
let press = type == Clutter.EventType.BUTTON_PRESS || type == Clutter.EventType.TOUCH_BEGIN; let press = type == Clutter.EventType.BUTTON_PRESS || type == Clutter.EventType.TOUCH_BEGIN;
let release = type == Clutter.EventType.BUTTON_RELEASE || type == Clutter.EventType.TOUCH_END; let release = type == Clutter.EventType.BUTTON_RELEASE || type == Clutter.EventType.TOUCH_END;
const targetActor = global.stage.get_event_actor(event);
if (event.get_source() == this._boxPointer.bin || if (targetActor === this._boxPointer.bin ||
this._boxPointer.bin.contains(event.get_source())) this._boxPointer.bin.contains(targetActor))
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
if (press) if (press)
@ -1296,7 +1299,7 @@ var KeyboardManager = class KeyBoardManager {
if (!this._keyboard) if (!this._keyboard)
return false; return false;
let actor = event.get_source(); const actor = global.stage.get_event_actor(event);
return Main.layoutManager.keyboardBox.contains(actor) || return Main.layoutManager.keyboardBox.contains(actor) ||
!!actor._extendedKeys || !!actor.extendedKey; !!actor._extendedKeys || !!actor.extendedKey;
} }