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

spinbutton: Avoid touch text handles to pop up

Browse Source 
Those get in the middle more than help on these widgets, the widget
is already packed with clickable areas and having handles (and their
invisible clickable area around) hovering above don't help, plus the
purpose in most likely numeric values is a bit doubtful.

All touch events are either consumed by the up/down panels, or
the swipe gesture, all GtkEntry handling of touch events on the text
window is avoided, so handles to not appear anymore.
This commit is contained in:
Carlos Garnacho 2014-05-22 16:04:03 +02:00
parent a4a122c8e8
commit 60e15deb83
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gtk/gtkspinbutton.c
View File

@ -166,7 +166,6 @@ struct _GtkSpinButtonPrivate
GtkOrientation orientation; GtkOrientation orientation;
GtkGesture *long_press_gesture;
GtkGesture *swipe_gesture; GtkGesture *swipe_gesture;
guint button : 2; guint button : 2;
@ -645,23 +644,22 @@ gtk_spin_button_get_property (GObject *object,
} }
static void static void
long_press_action (GtkGestureLongPress *gesture, swipe_gesture_begin (GtkGesture *gesture,
gdouble x, GdkEventSequence *sequence,
gdouble y, GtkSpinButton *spin_button)
GtkSpinButton *spin_button)
{ {
gtk_gesture_set_state (spin_button->priv->swipe_gesture, GdkEventSequence *current;
GTK_EVENT_SEQUENCE_DENIED); const GdkEvent *event;
}
static void current = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
long_press_cancel_action (GtkGestureLongPress *gesture, event = gtk_gesture_get_last_event (gesture, current);
gdouble x,
gdouble y, if (event->any.window == spin_button->priv->up_panel ||
GtkSpinButton *spin_button) event->any.window == spin_button->priv->down_panel)
{ gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
gtk_gesture_set_state (spin_button->priv->swipe_gesture,
GTK_EVENT_SEQUENCE_CLAIMED); gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_CLAIMED);
gtk_widget_grab_focus (GTK_WIDGET (spin_button));
} }
static void static void
@ -671,9 +669,6 @@ swipe_gesture_update (GtkGesture *gesture,
{ {
gdouble vel_y; gdouble vel_y;
if (gtk_gesture_get_sequence_state (gesture, sequence) != GTK_EVENT_SEQUENCE_CLAIMED)
return;
gtk_gesture_swipe_get_velocity (GTK_GESTURE_SWIPE (gesture), NULL, &vel_y); gtk_gesture_swipe_get_velocity (GTK_GESTURE_SWIPE (gesture), NULL, &vel_y);
gtk_spin_button_real_spin (spin_button, -vel_y / 20); gtk_spin_button_real_spin (spin_button, -vel_y / 20);
} }
@ -714,15 +709,10 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
gtk_widget_add_events (GTK_WIDGET (spin_button), GDK_SCROLL_MASK); gtk_widget_add_events (GTK_WIDGET (spin_button), GDK_SCROLL_MASK);
priv->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (spin_button));
gtk_gesture_attach (priv->long_press_gesture, GTK_PHASE_CAPTURE);
g_signal_connect (priv->long_press_gesture, "pressed",
G_CALLBACK (long_press_action), spin_button);
g_signal_connect (priv->long_press_gesture, "cancelled",
G_CALLBACK (long_press_cancel_action), spin_button);
priv->swipe_gesture = gtk_gesture_swipe_new (GTK_WIDGET (spin_button)); priv->swipe_gesture = gtk_gesture_swipe_new (GTK_WIDGET (spin_button));
gtk_gesture_attach (priv->swipe_gesture, GTK_PHASE_CAPTURE); gtk_gesture_attach (priv->swipe_gesture, GTK_PHASE_CAPTURE);
g_signal_connect (priv->swipe_gesture, "begin",
G_CALLBACK (swipe_gesture_begin), spin_button);
g_signal_connect (priv->swipe_gesture, "update", g_signal_connect (priv->swipe_gesture, "update",
G_CALLBACK (swipe_gesture_update), spin_button); G_CALLBACK (swipe_gesture_update), spin_button);
} }
@ -741,9 +731,6 @@ gtk_spin_button_finalize (GObject *object)
if (priv->up_panel_context) if (priv->up_panel_context)
g_object_unref (priv->up_panel_context); g_object_unref (priv->up_panel_context);
gtk_gesture_detach (priv->long_press_gesture);
g_object_unref (priv->long_press_gesture);
gtk_gesture_detach (priv->swipe_gesture); gtk_gesture_detach (priv->swipe_gesture);
g_object_unref (priv->swipe_gesture); g_object_unref (priv->swipe_gesture);