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

widget: Reset gestures on grab-notify

Browse Source 
If it is determined that the gesture will stop receiving
events, reset the gesture altogether.
This commit is contained in:
Carlos Garnacho 2014-03-24 14:42:13 +01:00
parent 997f05d99b
commit a56a9e4a62
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/gtkwidget.c
View File

@ -400,6 +400,7 @@ typedef struct {
typedef struct {
GtkGesture *controller;
guint evmask_notify_id;
guint grab_notify_id;
guint propagation_phase : 2;
} EventControllerData;
@ -16528,6 +16529,46 @@ _gtk_widget_get_action_group (GtkWidget *widget,
return NULL;
}
static void
event_controller_grab_notify (GtkWidget *widget,
gboolean was_grabbed,
EventControllerData *data)
{
GtkWidget *grab_widget, *toplevel;
GtkWindowGroup *group;
GdkDevice *device;
device = gtk_gesture_get_device (data->controller);
if (!device)
return;
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel))
group = gtk_window_get_group (GTK_WINDOW (toplevel));
else
group = gtk_window_get_group (NULL);
grab_widget = gtk_window_group_get_current_device_grab (group, device);
if (!grab_widget)
grab_widget = gtk_window_group_get_current_grab (group);
if (!grab_widget || grab_widget == widget)
return;
if (((data->propagation_phase == GTK_PHASE_NONE ||
data->propagation_phase == GTK_PHASE_BUBBLE) &&
!gtk_widget_is_ancestor (widget, grab_widget)) ||
(data->propagation_phase == GTK_PHASE_CAPTURE &&
!gtk_widget_is_ancestor (widget, grab_widget) &&
!gtk_widget_is_ancestor (grab_widget, widget)))
{
gtk_event_controller_reset (GTK_EVENT_CONTROLLER (data->controller));
}
}
static void
event_controller_notify_event_mask (GtkEventController *controller,
GParamSpec *pspec,
@ -16581,6 +16622,9 @@ gtk_widget_add_gesture (GtkWidget *widget,
data->evmask_notify_id =
g_signal_connect (gesture, "notify::event-mask",
G_CALLBACK (event_controller_notify_event_mask), widget);
data->grab_notify_id =
g_signal_connect (widget, "grab-notify",
G_CALLBACK (event_controller_grab_notify), data);
priv->event_controllers = g_list_prepend (priv->event_controllers, data);
}