summaryrefslogtreecommitdiff
path: root/gtk/gtkcolorplane.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2014-08-11 21:45:51 +0200
committerCarlos Garnacho <carlosg@gnome.org>2014-08-15 13:49:39 +0200
commit9e89640b0b950706a653c8df30fb7cd970d6d043 (patch)
tree1150259100e682f1c6b16f973c6ebb75faf8fe3e /gtk/gtkcolorplane.c
parent9ad4f1e62cff769e8eb4c67810c2ea718457ad5d (diff)
downloadgtk+-9e89640b0b950706a653c8df30fb7cd970d6d043.tar.gz
colorplane: Update to new GtkGestureSingle/GtkEventController defaults
GtkGestureSingle::button is set to 0, as multiple buttons are managed by the same gesture. Also avoid some extra lines of code setting what nowadays are default values. https://bugzilla.gnome.org/show_bug.cgi?id=734285
Diffstat (limited to 'gtk/gtkcolorplane.c')
-rw-r--r--gtk/gtkcolorplane.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
index 7adb4c94d2..a50e920f72 100644
--- a/gtk/gtkcolorplane.c
+++ b/gtk/gtkcolorplane.c
@@ -410,16 +410,13 @@ gtk_color_plane_init (GtkColorPlane *plane)
G_CALLBACK (plane_drag_gesture_update), plane);
g_signal_connect (plane->priv->drag_gesture, "drag-end",
G_CALLBACK (plane_drag_gesture_end), plane);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->drag_gesture),
- GTK_PHASE_BUBBLE);
- gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->priv->drag_gesture),
- FALSE);
+ gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (plane->priv->drag_gesture), 0);
plane->priv->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (plane));
g_signal_connect (plane->priv->long_press_gesture, "pressed",
G_CALLBACK (hold_action), plane);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (plane->priv->long_press_gesture),
- GTK_PHASE_BUBBLE);
+ gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->priv->drag_gesture),
+ TRUE);
}
static void