summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebarshi Ray <debarshir@gnome.org>2016-12-20 12:55:41 +0100
committerDebarshi Ray <debarshir@gnome.org>2016-12-20 18:48:03 +0100
commit2cbe0573513b1253a3dca2d43d626bc07e48efc3 (patch)
tree1a21956b1a6025923a159b6e4d4be7172e2b433a
parent1b553478f6e0a0fa5c333409cb81f603aff0e8a3 (diff)
downloadgtk+-2cbe0573513b1253a3dca2d43d626bc07e48efc3.tar.gz
flowbox: Don't emit child-activated while dragging the pointer
https://bugzilla.gnome.org/show_bug.cgi?id=776306
-rw-r--r--gtk/gtkflowbox.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index 69f89c64da..f365f298c9 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -2992,6 +2992,13 @@ gtk_flow_box_multipress_gesture_released (GtkGestureMultiPress *gesture,
gtk_flow_box_update_selection (box, priv->active_child, modify, extend);
}
}
+}
+
+static void
+gtk_flow_box_multipress_gesture_stopped (GtkGestureMultiPress *gesture,
+ GtkFlowBox *box)
+{
+ GtkFlowBoxPrivate *priv = BOX_PRIV (box);
priv->active_child = NULL;
priv->active_child_active = FALSE;
@@ -4053,6 +4060,8 @@ gtk_flow_box_init (GtkFlowBox *box)
G_CALLBACK (gtk_flow_box_multipress_gesture_pressed), box);
g_signal_connect (priv->multipress_gesture, "released",
G_CALLBACK (gtk_flow_box_multipress_gesture_released), box);
+ g_signal_connect (priv->multipress_gesture, "stopped",
+ G_CALLBACK (gtk_flow_box_multipress_gesture_stopped), box);
priv->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (box));
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture),