Merge branch 'wip/carlosg/stuck-pointer-focus' into 'master'

gtkmain: Do not try to coalesce/ignore crossing events

See merge request GNOME/gtk!1594
This commit is contained in:
Matthias Clasen 2020-04-01 00:16:26 +00:00
commit 5987bc5d71

View File

@ -1482,15 +1482,6 @@ handle_pointing_event (GdkEvent *event)
switch ((guint) type) switch ((guint) type)
{ {
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
if (gdk_crossing_event_get_mode (event) == GDK_CROSSING_NORMAL &&
gtk_window_lookup_pointer_focus_implicit_grab (toplevel, device, NULL))
{
/* We have an implicit grab, wait for the corresponding
* GDK_CROSSING_UNGRAB.
*/
break;
}
G_GNUC_FALLTHROUGH;
case GDK_TOUCH_END: case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL: case GDK_TOUCH_CANCEL:
old_target = update_pointer_focus_state (toplevel, event, NULL); old_target = update_pointer_focus_state (toplevel, event, NULL);
@ -1509,10 +1500,6 @@ handle_pointing_event (GdkEvent *event)
} }
break; break;
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
if (gdk_crossing_event_get_mode (event) == GDK_CROSSING_GRAB ||
gdk_crossing_event_get_mode (event) == GDK_CROSSING_UNGRAB)
break;
G_GNUC_FALLTHROUGH;
case GDK_DRAG_ENTER: case GDK_DRAG_ENTER:
case GDK_DRAG_MOTION: case GDK_DRAG_MOTION:
case GDK_DROP_START: case GDK_DROP_START: