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

range: Implement gtk_range_calc_stepper_sensitivity() properly

Browse Source
This commit is contained in:
Benjamin Otte 2014-11-29 02:17:27 +01:00
parent f63fe9b760
commit f3b40ff55f
1 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
gtk/gtkrange.c
View File

@ -3663,9 +3663,55 @@ gtk_range_calc_slider (GtkRange *range)
static void static void
gtk_range_calc_stepper_sensitivity (GtkRange *range) gtk_range_calc_stepper_sensitivity (GtkRange *range)
{ {
range->priv->need_recalc = TRUE; GtkRangePrivate *priv = range->priv;
gtk_range_calc_layout (range); gboolean was_upper_sensitive, was_lower_sensitive;
gtk_widget_queue_draw (GTK_WIDGET (range));
was_upper_sensitive = priv->upper_sensitive;
switch (priv->upper_sensitivity)
{
case GTK_SENSITIVITY_AUTO:
priv->upper_sensitive =
(gtk_adjustment_get_value (priv->adjustment) <
(gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
break;
case GTK_SENSITIVITY_ON:
priv->upper_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
priv->upper_sensitive = FALSE;
break;
}
was_lower_sensitive = priv->lower_sensitive;
switch (priv->lower_sensitivity)
{
case GTK_SENSITIVITY_AUTO:
priv->lower_sensitive =
(gtk_adjustment_get_value (priv->adjustment) > gtk_adjustment_get_lower (priv->adjustment));
break;
case GTK_SENSITIVITY_ON:
priv->lower_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
priv->lower_sensitive = FALSE;
break;
}
/* Too many side effects can influence which stepper reacts to wat condition.
* So we just invalidate them all.
*/
if (was_upper_sensitive != priv->upper_sensitive ||
was_lower_sensitive != priv->lower_sensitive)
{
gtk_range_queue_draw_location (range, MOUSE_STEPPER_A);
gtk_range_queue_draw_location (range, MOUSE_STEPPER_B);
gtk_range_queue_draw_location (range, MOUSE_STEPPER_C);
gtk_range_queue_draw_location (range, MOUSE_STEPPER_D);
}
} }
static void static void
@ -3916,38 +3962,7 @@ gtk_range_calc_layout (GtkRange *range)
gtk_range_calc_slider (range); gtk_range_calc_slider (range);
gtk_range_update_mouse_location (range); gtk_range_update_mouse_location (range);
switch (priv->upper_sensitivity) gtk_range_calc_stepper_sensitivity (range);
{
case GTK_SENSITIVITY_AUTO:
priv->upper_sensitive =
(gtk_adjustment_get_value (priv->adjustment) <
(gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment)));
break;
case GTK_SENSITIVITY_ON:
priv->upper_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
priv->upper_sensitive = FALSE;
break;
}
switch (priv->lower_sensitivity)
{
case GTK_SENSITIVITY_AUTO:
priv->lower_sensitive =
(gtk_adjustment_get_value (priv->adjustment) > gtk_adjustment_get_lower (priv->adjustment));
break;
case GTK_SENSITIVITY_ON:
priv->lower_sensitive = TRUE;
break;
case GTK_SENSITIVITY_OFF:
priv->lower_sensitive = FALSE;
break;
}
} }
static void static void