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

grabHelper: Fix handling of events within the grabbed actor

Browse Source 
Commit d92b71d2b2 went overeager in the removal of the additional
actors that were allowed to handle events (since the new grab
infrastructure makes them unable to see events in the first place),
and removed an early return in the captured event handler meant to
let events go through in those cases.

Since the grabbing actor was also part of this group, this was also
the code path where child actors of the grabbing actor could handle
events. Removing these made the captured event handler eat most
events meant for children. Add this check back, specifically for the
grabbing actor.

While at it, explicitly check (and propagate) crossing events,
since these are now enforced to be propagated (and warned about) in
Mutter.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4991
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2140>
This commit is contained in:
Carlos Garnacho 2022-01-31 12:16:47 +01:00 committed by Marge Bot
parent f6edfd503b
commit e374a4957f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/grabHelper.js
View File

@ -261,6 +261,11 @@ var GrabHelper = class GrabHelper {
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
} }
if (type === Clutter.EventType.ENTER ||
type === Clutter.EventType.LEAVE ||
this.currentGrab.actor.contains(event.get_source()))
return Clutter.EVENT_PROPAGATE;
if (Main.keyboard.shouldTakeEvent(event)) if (Main.keyboard.shouldTakeEvent(event))
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;