summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-04-01 00:16:26 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-04-01 00:16:26 +0000
commit5987bc5d7182e053f61b7661552e42071ad400c1 (patch)
tree20d6d8fba08d767d27ecaceb36bf284eb8a81e0a
parent298218b1d2e83ad6c3474fd34cafe66317f85a14 (diff)
parentfa7f6ad910774a57f028093ef0766a7905cb2136 (diff)
downloadgtk+-5987bc5d7182e053f61b7661552e42071ad400c1.tar.gz
Merge branch 'wip/carlosg/stuck-pointer-focus' into 'master'
gtkmain: Do not try to coalesce/ignore crossing events See merge request GNOME/gtk!1594
-rw-r--r--gtk/gtkmain.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ff196e84b5..0b99a0030f 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1482,15 +1482,6 @@ handle_pointing_event (GdkEvent *event)
switch ((guint) type)
{
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_CANCEL:
old_target = update_pointer_focus_state (toplevel, event, NULL);
@@ -1509,10 +1500,6 @@ handle_pointing_event (GdkEvent *event)
}
break;
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_MOTION:
case GDK_DROP_START: