[gtk+] range: Make multipress gesture accept all buttons
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] range: Make multipress gesture accept all buttons
- Date: Fri, 15 Aug 2014 11:56:21 +0000 (UTC)
commit af5a03c841b65cbc52daf63ddaa8e3db833ace1e
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Aug 12 14:02:24 2014 +0200
range: Make multipress gesture accept all buttons
That gesture is meant to handle clicks from several buttons, so unset
the new GDK_BUTTON_PRIMARY default. Also, remove unnecessary boilerplate
with the new default values.
https://bugzilla.gnome.org/show_bug.cgi?id=734285
gtk/gtkrange.c | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index c65f58f..19981e5 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -757,22 +757,13 @@ gtk_range_init (GtkRange *range)
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (range));
priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (range));
- gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->multipress_gesture),
- FALSE);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->multipress_gesture),
- GTK_PHASE_BUBBLE);
+ gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
g_signal_connect (priv->multipress_gesture, "pressed",
G_CALLBACK (gtk_range_multipress_gesture_pressed), range);
g_signal_connect (priv->multipress_gesture, "released",
G_CALLBACK (gtk_range_multipress_gesture_released), range);
priv->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (range));
- gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->drag_gesture),
- FALSE);
- gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->drag_gesture),
- GDK_BUTTON_PRIMARY);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
- GTK_PHASE_BUBBLE);
g_signal_connect (priv->drag_gesture, "drag-update",
G_CALLBACK (gtk_range_drag_gesture_update), range);
g_signal_connect (priv->drag_gesture, "drag-end",
@@ -780,12 +771,6 @@ gtk_range_init (GtkRange *range)
priv->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (range));
gtk_gesture_group (priv->drag_gesture, priv->long_press_gesture);
- gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->long_press_gesture),
- FALSE);
- gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->long_press_gesture),
- GDK_BUTTON_PRIMARY);
- gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->long_press_gesture),
- GTK_PHASE_BUBBLE);
g_signal_connect (priv->long_press_gesture, "pressed",
G_CALLBACK (gtk_range_long_press_gesture_pressed), range);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]