AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

range: use a fixed offset for mark "snap" size

Browse Source 
Instead of making it dependent on the slider size.
This commit is contained in:
Cosimo Cecchi 2016-03-05 19:04:41 -08:00
parent 6efe1f411a
commit 990bd03c35
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkrange.c
View File

@ -69,6 +69,7 @@
#define TIMEOUT_REPEAT 250 #define TIMEOUT_REPEAT 250
#define AUTOSCROLL_FACTOR 20 #define AUTOSCROLL_FACTOR 20
#define SCROLL_EDGE_SIZE 15 #define SCROLL_EDGE_SIZE 15
#define MARK_SNAP_LENGTH 12
typedef struct _GtkRangeStepTimer GtkRangeStepTimer; typedef struct _GtkRangeStepTimer GtkRangeStepTimer;
@ -2834,7 +2835,6 @@ update_slider_position (GtkRange *range,
gdouble mark_value; gdouble mark_value;
gdouble mark_delta; gdouble mark_delta;
gdouble zoom; gdouble zoom;
gint slider_start, slider_end;
gint i; gint i;
GtkAllocation slider_alloc, trough_alloc; GtkAllocation slider_alloc, trough_alloc;
@ -2874,7 +2874,6 @@ update_slider_position (GtkRange *range,
new_value = coord_to_value (range, c); new_value = coord_to_value (range, c);
next_value = coord_to_value (range, c + 1); next_value = coord_to_value (range, c + 1);
mark_delta = fabs (next_value - new_value); mark_delta = fabs (next_value - new_value);
gtk_range_get_slider_range (range, &slider_start, &slider_end);
for (i = 0; i < priv->n_marks; i++) for (i = 0; i < priv->n_marks; i++)
{ {
@ -2882,7 +2881,7 @@ update_slider_position (GtkRange *range,
if (fabs (gtk_adjustment_get_value (priv->adjustment) - mark_value) < 3 * mark_delta) if (fabs (gtk_adjustment_get_value (priv->adjustment) - mark_value) < 3 * mark_delta)
{ {
if (fabs (new_value - mark_value) < (slider_end - slider_start) * 0.5 * mark_delta) if (fabs (new_value - mark_value) < MARK_SNAP_LENGTH * mark_delta)
{ {
new_value = mark_value; new_value = mark_value;
break; break;