Make spinbuttons work with negative increments. (#137975, Tim Gerla)

2004-04-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
	work with negative increments.  (#137975, Tim Gerla)

diff --git a/ChangeLog b/ChangeLog
index 846727b6b9f2a169ab1495fbe4440ac88499fd5c..b0aebb9cadd0203e97e40e9f04e040b9afaa2810 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 846727b6b9f2a169ab1495fbe4440ac88499fd5c..b0aebb9cadd0203e97e40e9f04e040b9afaa2810 100644 (file)
--- 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 846727b6b9f2a169ab1495fbe4440ac88499fd5c..b0aebb9cadd0203e97e40e9f04e040b9afaa2810 100644 (file)
--- 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 846727b6b9f2a169ab1495fbe4440ac88499fd5c..b0aebb9cadd0203e97e40e9f04e040b9afaa2810 100644 (file)
--- 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 846727b6b9f2a169ab1495fbe4440ac88499fd5c..b0aebb9cadd0203e97e40e9f04e040b9afaa2810 100644 (file)
--- 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 1c4c30924b6d1fcf442d8cc6dd4e9418633a9245..2a062115b8a05581b0166deb05db73984c072e30 100644 (file)
--- 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;