[gtk+/wip/baedert/gtkimageview: 112/113] Revert "GtkRange: Make drag gesture less agressive"



commit f38ddd4d1b6e0d7522a51ceeedd178ebf426ceb9
Author: Timm Bäder <mail baedert org>
Date:   Mon Aug 3 15:13:13 2015 +0200

    Revert "GtkRange: Make drag gesture less agressive"
    
    This reverts commit 27dabaefa6f6edee78e05e6a76fccf20be2c7679.

 gtk/gtkrange.c |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 2f7cae5..3ed8434 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2286,7 +2286,7 @@ range_grab_remove (GtkRange *range)
 }
 
 static GtkScrollType
-range_get_scroll_for_grab (GtkRange *range)
+range_get_scroll_for_grab (GtkRange      *range)
 {
   GtkRangePrivate *priv = range->priv;
   guint grab_button;
@@ -2397,6 +2397,7 @@ coord_to_value (GtkRange *range,
   value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) -
                                             gtk_adjustment_get_lower (priv->adjustment) -
                                             gtk_adjustment_get_page_size (priv->adjustment));
+
   return value;
 }
 
@@ -2924,18 +2925,15 @@ gtk_range_drag_gesture_update (GtkGestureDrag *gesture,
   GtkRangePrivate *priv = range->priv;
   gdouble start_x, start_y;
 
-  if (range->priv->grab_location == MOUSE_SLIDER)
-    {
-      gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
-      priv->mouse_x = start_x + offset_x;
-      priv->mouse_y = start_y + offset_y;
-      priv->in_drag = TRUE;
+  gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
+  priv->mouse_x = start_x + offset_x;
+  priv->mouse_y = start_y + offset_y;
+  priv->in_drag = TRUE;
 
-      update_autoscroll_mode (range);
+  update_autoscroll_mode (range);
 
-      if (priv->autoscroll_mode == GTK_SCROLL_NONE)
-        update_slider_position (range, priv->mouse_x, priv->mouse_y);
-    }
+  if (priv->autoscroll_mode == GTK_SCROLL_NONE)
+    update_slider_position (range, priv->mouse_x, priv->mouse_y);
 }
 
 static void
@@ -2954,11 +2952,8 @@ gtk_range_drag_gesture_end (GtkGestureDrag       *gesture,
                             gdouble               offset_y,
                             GtkRange             *range)
 {
-  if (range->priv->grab_location == MOUSE_SLIDER)
-    {
-      range->priv->in_drag = FALSE;
-      stop_scrolling (range);
-    }
+  range->priv->in_drag = FALSE;
+  stop_scrolling (range);
 }
 
 static gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]