Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure we only send one grab broken event

Browse Source 
We were incorrectly sending grab broken events in two places which
could cause multiple events for a single grab broken.
This commit is contained in:
Alexander Larsson
2009-08-27 13:11:04 +02:00
parent 51f140bfdc
commit 41054425b9
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/gdkdisplay.c
View File

@@ -1037,11 +1037,6 @@ switch_to_pointer_grab (GdkDisplay *display,
/* We're now ungrabbed, update the window_under_pointer */ /* We're now ungrabbed, update the window_under_pointer */
_gdk_display_set_window_under_pointer (display, pointer_window); _gdk_display_set_window_under_pointer (display, pointer_window);
if (last_grab->implicit_ungrab)
generate_grab_broken_event (last_grab->window,
FALSE, TRUE,
NULL);
} }
} }
@@ -1089,13 +1084,12 @@ _gdk_display_pointer_grab_update (GdkDisplay *display,
next_grab = NULL; /* Actually its not yet active */ next_grab = NULL; /* Actually its not yet active */
} }
if (next_grab == NULL || if ((next_grab == NULL && current_grab->implicit_ungrab) ||
current_grab->window != next_grab->window) (next_grab != NULL && current_grab->window != next_grab->window))
generate_grab_broken_event (GDK_WINDOW (current_grab->window), generate_grab_broken_event (GDK_WINDOW (current_grab->window),
FALSE, current_grab->implicit, FALSE, current_grab->implicit,
next_grab? next_grab->window : NULL); next_grab? next_grab->window : NULL);
/* Remove old grab */ /* Remove old grab */
display->pointer_grabs = display->pointer_grabs =
g_list_delete_link (display->pointer_grabs, g_list_delete_link (display->pointer_grabs,