callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkRange: Make drag gesture less agressive

Browse Source 
Moving the mouse while pressing one of the steppers was making
the slider jump to the end, unexpectedly. This was caused by the
drag gesture kicking in when it shouldn't. Fix this by making
all drag gesture signal handlers only do something if we are in
a drag thats started on the slider.

https://bugzilla.gnome.org/show_bug.cgi?id=751050
This commit is contained in:
Matthias Clasen 2015-06-20 18:37:15 -04:00
parent b4a88c7287
commit 27dabaefa6
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkrange.c
View File

@ -2286,7 +2286,7 @@ range_grab_remove (GtkRange *range)
} }
static GtkScrollType static GtkScrollType
range_get_scroll_for_grab (GtkRange *range) range_get_scroll_for_grab (GtkRange *range)
{ {
GtkRangePrivate *priv = range->priv; GtkRangePrivate *priv = range->priv;
guint grab_button; guint grab_button;
@ -2397,7 +2397,6 @@ coord_to_value (GtkRange *range,
value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) - value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) -
gtk_adjustment_get_lower (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
gtk_adjustment_get_page_size (priv->adjustment)); gtk_adjustment_get_page_size (priv->adjustment));
return value; return value;
} }
@ -2925,15 +2924,18 @@ gtk_range_drag_gesture_update (GtkGestureDrag *gesture,
GtkRangePrivate *priv = range->priv; GtkRangePrivate *priv = range->priv;
gdouble start_x, start_y; gdouble start_x, start_y;
gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y); if (range->priv->grab_location == MOUSE_SLIDER)
priv->mouse_x = start_x + offset_x; {
priv->mouse_y = start_y + offset_y; gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
priv->in_drag = TRUE; 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) if (priv->autoscroll_mode == GTK_SCROLL_NONE)
update_slider_position (range, priv->mouse_x, priv->mouse_y); update_slider_position (range, priv->mouse_x, priv->mouse_y);
}
} }
static void static void
@ -2952,8 +2954,11 @@ gtk_range_drag_gesture_end (GtkGestureDrag *gesture,
gdouble offset_y, gdouble offset_y,
GtkRange *range) GtkRange *range)
{ {
range->priv->in_drag = FALSE; if (range->priv->grab_location == MOUSE_SLIDER)
stop_scrolling (range); {
range->priv->in_drag = FALSE;
stop_scrolling (range);
}
} }
static gboolean static gboolean