brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Only emit regular crossing events in the actors they make sense

Browse Source 
Instead of propagating ENTER/LEAVE all the way from the stage, emit those
events only in the actors that are actually entered or left.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2068>
This commit is contained in:
Carlos Garnacho 2021-10-27 18:14:22 +02:00 committed by Marge Bot
parent 3e9d14c5c7
commit 2e94efddc9
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter/clutter-stage.c
View File

@ -3526,7 +3526,7 @@ clutter_stage_update_device (ClutterStage *stage,
gboolean emit_crossing) gboolean emit_crossing)
{ {
ClutterInputDeviceType device_type; ClutterInputDeviceType device_type;
ClutterActor *old_actor; ClutterActor *old_actor, *root;
gboolean device_actor_changed; gboolean device_actor_changed;
ClutterEvent *event; ClutterEvent *event;
@ -3553,6 +3553,24 @@ clutter_stage_update_device (ClutterStage *stage,
point.y, point.y,
_clutter_actor_get_debug_name (new_actor)); _clutter_actor_get_debug_name (new_actor));
if (emit_crossing)
{
ClutterActor *grab_actor;
root = find_common_root_actor (stage, new_actor, old_actor);
grab_actor = clutter_stage_get_grab_actor (stage);
/* If the common root is outside the currently effective grab,
* it involves actors outside the grabbed actor hierarchy, the
* events should be propagated from/inside the grab actor.
*/
if (grab_actor &&
root != grab_actor &&
!clutter_actor_contains (grab_actor, root))
root = grab_actor;
}
/* we need to make sure that this event is processed /* we need to make sure that this event is processed
* before any other event we might have queued up until * before any other event we might have queued up until
* now, so we go on, and synthesize the event emission * now, so we go on, and synthesize the event emission
@ -3566,7 +3584,8 @@ clutter_stage_update_device (ClutterStage *stage,
old_actor, new_actor, old_actor, new_actor,
point, time_ms); point, time_ms);
if (!_clutter_event_process_filters (event)) if (!_clutter_event_process_filters (event))
_clutter_process_event (event); _clutter_actor_handle_event (old_actor, root, event);
clutter_event_free (event); clutter_event_free (event);
} }
@ -3578,7 +3597,8 @@ clutter_stage_update_device (ClutterStage *stage,
new_actor, old_actor, new_actor, old_actor,
point, time_ms); point, time_ms);
if (!_clutter_event_process_filters (event)) if (!_clutter_event_process_filters (event))
_clutter_process_event (event); _clutter_actor_handle_event (new_actor, root, event);
clutter_event_free (event); clutter_event_free (event);
} }
} }