callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkwindow: Resort to regular event bubbling by all means on non-toplevels

Browse Source 
If the multipress gesture is not created (ie. not a toplevel GtkWindow),
also avoid possibly calling gtk_widget_event() on the events gotten here.
This commit is contained in:
Carlos Garnacho 2014-11-04 17:08:49 +01:00
parent 03a30e462e
commit d9a433daf7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkwindow.c
View File

@ -7735,6 +7735,7 @@ gtk_window_handle_wm_event (GtkWindow *window,
gboolean gboolean
_gtk_window_check_handle_wm_event (GdkEvent *event) _gtk_window_check_handle_wm_event (GdkEvent *event)
{ {
GtkWindowPrivate *priv;
GtkWidget *widget; GtkWidget *widget;
widget = gtk_get_event_widget (event); widget = gtk_get_event_widget (event);
@ -7742,6 +7743,11 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
if (!GTK_IS_WINDOW (widget)) if (!GTK_IS_WINDOW (widget))
return GDK_EVENT_PROPAGATE; return GDK_EVENT_PROPAGATE;
priv = GTK_WINDOW (widget)->priv;
if (!priv->multipress_gesture)
return GDK_EVENT_PROPAGATE;
if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE && if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE &&
event->type != GDK_MOTION_NOTIFY && event->type != GDK_TOUCH_BEGIN && event->type != GDK_MOTION_NOTIFY && event->type != GDK_TOUCH_BEGIN &&
event->type != GDK_TOUCH_END && event->type != GDK_TOUCH_UPDATE) event->type != GDK_TOUCH_END && event->type != GDK_TOUCH_UPDATE)