AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 08:20:36 +00:00
Code Issues Projects Releases Wiki Activity

widget: Include event controllers' event mask on gtk_widget_get_events()

Browse Source 
gtk_widget_get_events() must indeed tell about events enabled purely through
a GtkEventController, those events will most surely trigger event handlers.

https://bugzilla.gnome.org/show_bug.cgi?id=734357
This commit is contained in:
Carlos Garnacho 2014-08-11 16:44:51 +02:00
parent 225bb95795
commit 62507776fe
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwidget.c
View File

@ -11522,6 +11522,11 @@ gtk_widget_get_settings (GtkWidget *widget)
* from the #GdkEventMask enumeration). These are the events that the widget
* will receive.
*
* Note: Internally, the widget event mask will be the logical OR of the event
* mask set through gtk_widget_set_events() or gtk_widget_add_events(), and the
* event mask necessary to cater for every #GtkEventController created for the
* widget.
*
* Returns: event mask for @widget
**/
gint
@ -11529,7 +11534,8 @@ gtk_widget_get_events (GtkWidget *widget)
{
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
return GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_event_mask));
return GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (widget), quark_event_mask)) |
_gtk_widget_get_controllers_evmask (widget);
}
/**