diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2011-12-12 19:14:43 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2012-03-01 16:25:24 -0500 |
| commit | 6427fdb291cec9b1b30d3d9735bc78b57722e15a (patch) | |
| tree | 38bb11272c4805bdabd192ac4fa1f1c12b1b0fc3 /gtk/gtkrange.c | |
| parent | 87f6bb32edb3c63f1fce405df3910db1c8588e8c (diff) | |
| download | gtk+-6427fdb291cec9b1b30d3d9735bc78b57722e15a.tar.gz | |
range: Remove gtk-touchscreen-mode usage
Emulated crossing events with mode GDK_CROSSING_TOUCH_PRESS/RELEASE
already cater dynamically for the "don't prelight on touch devices"
usecase.
Diffstat (limited to 'gtk/gtkrange.c')
| -rw-r--r-- | gtk/gtkrange.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 8b43a7c884..23a4991306 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -2007,15 +2007,11 @@ gtk_range_draw (GtkWidget *widget, GtkStateFlags widget_state; gint focus_line_width = 0; gint focus_padding = 0; - gboolean touchscreen; gboolean draw_trough = TRUE; gboolean draw_slider = TRUE; GtkStyleContext *context; context = gtk_widget_get_style_context (widget); - g_object_get (gtk_widget_get_settings (widget), - "gtk-touchscreen-mode", &touchscreen, - NULL); if (GTK_IS_SCALE (widget) && gtk_adjustment_get_upper (priv->adjustment) == gtk_adjustment_get_lower (priv->adjustment)) @@ -2277,7 +2273,7 @@ gtk_range_draw (GtkWidget *widget, state &= ~(GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_ACTIVE); - if (!touchscreen && priv->mouse_location == MOUSE_SLIDER && !(state & GTK_STATE_FLAG_INSENSITIVE)) + if (priv->mouse_location == MOUSE_SLIDER && !(state & GTK_STATE_FLAG_INSENSITIVE)) state |= GTK_STATE_FLAG_PRELIGHT; if (priv->grab_location == MOUSE_SLIDER) @@ -2307,28 +2303,28 @@ gtk_range_draw (GtkWidget *widget, draw_stepper (range, STEPPER_A, cr, priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT, priv->grab_location == MOUSE_STEPPER_A, - !touchscreen && priv->mouse_location == MOUSE_STEPPER_A, + priv->mouse_location == MOUSE_STEPPER_A, widget_state); if (priv->has_stepper_b) draw_stepper (range, STEPPER_B, cr, priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT, priv->grab_location == MOUSE_STEPPER_B, - !touchscreen && priv->mouse_location == MOUSE_STEPPER_B, + priv->mouse_location == MOUSE_STEPPER_B, widget_state); if (priv->has_stepper_c) draw_stepper (range, STEPPER_C, cr, priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT, priv->grab_location == MOUSE_STEPPER_C, - !touchscreen && priv->mouse_location == MOUSE_STEPPER_C, + priv->mouse_location == MOUSE_STEPPER_C, widget_state); if (priv->has_stepper_d) draw_stepper (range, STEPPER_D, cr, priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT, priv->grab_location == MOUSE_STEPPER_D, - !touchscreen && priv->mouse_location == MOUSE_STEPPER_D, + priv->mouse_location == MOUSE_STEPPER_D, widget_state); return FALSE; |