AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

widget: Fix gesture event handler retval for bubbled events

Browse Source 
Do not clobber the return value if the regular event handler happens
to return FALSE, even if the gesture meant to consume the event.
This commit is contained in:
Carlos Garnacho 2014-05-07 19:06:42 +02:00
parent 2a0bf33bc9
commit 6e9b054543
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkwidget.c
View File

@ -7459,7 +7459,7 @@ static gint
gtk_widget_event_internal (GtkWidget *widget, gtk_widget_event_internal (GtkWidget *widget,
GdkEvent *event) GdkEvent *event)
{ {
gboolean return_val = FALSE; gboolean return_val = FALSE, handled;
/* We check only once for is-still-visible; if someone /* We check only once for is-still-visible; if someone
* hides the window in on of the signals on the widget, * hides the window in on of the signals on the widget,
@ -7472,8 +7472,8 @@ gtk_widget_event_internal (GtkWidget *widget,
g_object_ref (widget); g_object_ref (widget);
return_val |= _gtk_widget_run_controllers (widget, event, GTK_PHASE_BUBBLE); return_val |= _gtk_widget_run_controllers (widget, event, GTK_PHASE_BUBBLE);
g_signal_emit (widget, widget_signals[EVENT], 0, event, &return_val); g_signal_emit (widget, widget_signals[EVENT], 0, event, &handled);
return_val |= !WIDGET_REALIZED_FOR_EVENT (widget, event); return_val |= handled | !WIDGET_REALIZED_FOR_EVENT (widget, event);
if (!return_val) if (!return_val)
{ {
gint signal_num; gint signal_num;
@ -7575,7 +7575,10 @@ gtk_widget_event_internal (GtkWidget *widget,
break; break;
} }
if (signal_num != -1) if (signal_num != -1)
g_signal_emit (widget, widget_signals[signal_num], 0, event, &return_val); {
g_signal_emit (widget, widget_signals[signal_num], 0, event, &handled);
return_val |= handled;
}
} }
if (WIDGET_REALIZED_FOR_EVENT (widget, event)) if (WIDGET_REALIZED_FOR_EVENT (widget, event))
g_signal_emit (widget, widget_signals[EVENT_AFTER], 0, event); g_signal_emit (widget, widget_signals[EVENT_AFTER], 0, event);