diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkspinbutton.c | 11 |
6 files changed, 34 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons + work with negative increments. (#137975, Tim Gerla) + Wed Apr 21 21:38:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 846727b6b9..b0aebb9cad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons + work with negative increments. (#137975, Tim Gerla) + Wed Apr 21 21:38:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 846727b6b9..b0aebb9cad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons + work with negative increments. (#137975, Tim Gerla) + Wed Apr 21 21:38:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 846727b6b9..b0aebb9cad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons + work with negative increments. (#137975, Tim Gerla) + Wed Apr 21 21:38:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 846727b6b9..b0aebb9cad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-04-22 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons + work with negative increments. (#137975, Tim Gerla) + Wed Apr 21 21:38:03 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbutton.c (gtk_tool_button_set_label_widget, diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 1c4c30924b..2a062115b8 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -823,14 +823,21 @@ static gboolean spin_button_at_limit (GtkSpinButton *spin_button, GtkArrowType arrow) { + GtkArrowType effective_arrow; + if (spin_button->wrap) return FALSE; - if (arrow == GTK_ARROW_UP && + if (spin_button->adjustment->step_increment > 0) + effective_arrow = arrow; + else + effective_arrow = arrow == GTK_ARROW_UP ? GTK_ARROW_DOWN : GTK_ARROW_UP; + + if (effective_arrow == GTK_ARROW_UP && (spin_button->adjustment->upper - spin_button->adjustment->value <= EPSILON)) return TRUE; - if (arrow == GTK_ARROW_DOWN && + if (effective_arrow == GTK_ARROW_DOWN && (spin_button->adjustment->value - spin_button->adjustment->lower <= EPSILON)) return TRUE; |