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

SpinButton: Desensitise +/- buttons as appropriate

Browse Source 
The logic for this in 3 got lost in the move from gadgets to widgets. We
must update the sensitivities when :wrap, :value, or the bounds change.

Close: https://gitlab.gnome.org/GNOME/gtk/issues/88
This commit is contained in:
Daniel Boles 2018-03-17 15:39:36 +00:00
parent a25dcd0f74
commit 41a5e744d8
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkspinbutton.c
View File

@ -956,10 +956,24 @@ gtk_spin_button_realize (GtkWidget *widget)
gtk_widget_queue_resize (GTK_WIDGET (spin_button)); gtk_widget_queue_resize (GTK_WIDGET (spin_button));
} }
/* This is called when :value, :wrap, or the bounds of the adjustment change,
* as the combination of those determines if our up|down_button are sensitive */
static void
update_buttons_sensitivity (GtkSpinButton *spin_button)
{
GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button);
int lower = gtk_adjustment_get_lower (priv->adjustment);
int upper = gtk_adjustment_get_upper (priv->adjustment);
int value = gtk_adjustment_get_value (priv->adjustment);
gtk_widget_set_sensitive (priv->up_button,
priv->wrap || upper - value > EPSILON);
gtk_widget_set_sensitive (priv->down_button,
priv->wrap || value - lower > EPSILON);
}
/* Callback used when the spin button's adjustment changes. /* Callback used when the spin button's adjustment changes.
* We need to redraw the arrows when the adjustment’s range * We need to reevaluate our size request & up|down_button sensitivity. */
* changes, and reevaluate our size request.
*/
static void static void
adjustment_changed_cb (GtkAdjustment *adjustment, gpointer data) adjustment_changed_cb (GtkAdjustment *adjustment, gpointer data)
{ {
@ -967,6 +981,8 @@ adjustment_changed_cb (GtkAdjustment *adjustment, gpointer data)
GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button); GtkSpinButtonPrivate *priv = gtk_spin_button_get_instance_private (spin_button);
priv->timer_step = gtk_adjustment_get_step_increment (priv->adjustment); priv->timer_step = gtk_adjustment_get_step_increment (priv->adjustment);
update_buttons_sensitivity (spin_button);
gtk_widget_queue_resize (GTK_WIDGET (spin_button)); gtk_widget_queue_resize (GTK_WIDGET (spin_button));
} }
@ -1184,6 +1200,7 @@ gtk_spin_button_value_changed (GtkAdjustment *adjustment,
g_signal_emit (spin_button, spinbutton_signals[VALUE_CHANGED], 0); g_signal_emit (spin_button, spinbutton_signals[VALUE_CHANGED], 0);
update_buttons_sensitivity (spin_button);
gtk_widget_queue_draw (GTK_WIDGET (spin_button)); gtk_widget_queue_draw (GTK_WIDGET (spin_button));
g_object_notify (G_OBJECT (spin_button), "value"); g_object_notify (G_OBJECT (spin_button), "value");
@ -2038,8 +2055,9 @@ gtk_spin_button_set_wrap (GtkSpinButton *spin_button,
if (priv->wrap != wrap) if (priv->wrap != wrap)
{ {
priv->wrap = wrap; priv->wrap = wrap;
g_object_notify (G_OBJECT (spin_button), "wrap"); g_object_notify (G_OBJECT (spin_button), "wrap");
update_buttons_sensitivity (spin_button);
} }
} }