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

range: Implement gtk_range_calc_slider() properly

Browse Source
This commit is contained in:
Benjamin Otte 2014-11-29 01:47:31 +01:00
parent 040c31a32c
commit f63fe9b760
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk/gtkrange.c
View File

@ -3625,12 +3625,39 @@ gtk_range_compute_slider_position (GtkRange *range,
} }
} }
static gboolean
rectangle_equal (const GdkRectangle *a,
const GdkRectangle *b)
{
return a->x == b->x
&& a->y == b->y
&& a->width == b->width
&& a->height == b->height;
}
static void static void
gtk_range_calc_slider (GtkRange *range) gtk_range_calc_slider (GtkRange *range)
{ {
range->priv->need_recalc = TRUE; GtkRangePrivate *priv = range->priv;
gtk_range_calc_layout (range); GdkRectangle new_slider;
gtk_widget_queue_draw (GTK_WIDGET (range));
gtk_range_compute_slider_position (range,
gtk_adjustment_get_value (priv->adjustment),
&new_slider);
if (rectangle_equal (&priv->slider, &new_slider))
return;
gtk_range_queue_draw_location (range, MOUSE_SLIDER);
priv->slider = new_slider;
gtk_range_queue_draw_location (range, MOUSE_SLIDER);
if (priv->has_origin)
gtk_range_queue_draw_location (range, MOUSE_TROUGH);
gtk_range_update_mouse_location (range);
} }
static void static void
@ -3790,10 +3817,6 @@ gtk_range_calc_layout (GtkRange *range)
priv->trough.y = priv->stepper_b.y + priv->stepper_b.height + stepper_spacing * has_steppers_ab; priv->trough.y = priv->stepper_b.y + priv->stepper_b.height + stepper_spacing * has_steppers_ab;
priv->trough.width = range_rect.width; priv->trough.width = range_rect.width;
priv->trough.height = priv->stepper_c.y - priv->trough.y - stepper_spacing * has_steppers_cd; priv->trough.height = priv->stepper_c.y - priv->trough.y - stepper_spacing * has_steppers_cd;
gtk_range_compute_slider_position (range,
gtk_adjustment_get_value (priv->adjustment),
&priv->slider);
} }
else else
{ {
@ -3888,12 +3911,9 @@ gtk_range_calc_layout (GtkRange *range)
priv->trough.y = range_rect.y; priv->trough.y = range_rect.y;
priv->trough.width = priv->stepper_c.x - priv->trough.x - stepper_spacing * has_steppers_cd; priv->trough.width = priv->stepper_c.x - priv->trough.x - stepper_spacing * has_steppers_cd;
priv->trough.height = range_rect.height; priv->trough.height = range_rect.height;
gtk_range_compute_slider_position (range,
gtk_adjustment_get_value (priv->adjustment),
&priv->slider);
} }
gtk_range_calc_slider (range);
gtk_range_update_mouse_location (range); gtk_range_update_mouse_location (range);
switch (priv->upper_sensitivity) switch (priv->upper_sensitivity)