gtk-engines r1155 - in trunk: . engines/industrial/src

[bberg svn gnome org]

Author: bberg
Date: Wed Apr  9 21:10:19 2008
New Revision: 1155
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1155&view=rev

Log:
2008-04-09  Benjamin Berg  <benjamin sipsolutions net>

	* engines/industrial/src/industrial_style.c: (draw_slider):
	The stepper button check was only missing in industrial.


Modified:
   trunk/ChangeLog
   trunk/engines/industrial/src/industrial_style.c

Modified: trunk/engines/industrial/src/industrial_style.c
==============================================================================
--- trunk/engines/industrial/src/industrial_style.c	(original)
+++ trunk/engines/industrial/src/industrial_style.c	Wed Apr  9 21:10:19 2008
@@ -516,6 +516,7 @@
 	/* This makes the slider overlay the stepper buttons at the sides. XXX */
 	if (widget && GE_IS_SCROLLBAR (widget)) {
 		GtkAdjustment *adjustment = GTK_RANGE (widget)->adjustment;
+
 		/* If all of these values are 0, don't do anything.  This fixes mozilla/galeon scrollbars. */
 		if (adjustment->value ||
 		    adjustment->lower ||
@@ -523,7 +524,8 @@
 		    adjustment->step_increment ||
 		    adjustment->page_increment ||
 		    adjustment->page_size) {
-			if (adjustment->value <= adjustment->lower) {
+			if ((adjustment->value <= adjustment->lower) &&
+			    (GTK_RANGE (widget)->has_stepper_a || GTK_RANGE (widget)->has_stepper_b)) {
 				if (orientation == GTK_ORIENTATION_VERTICAL) {
 					if (!gtk_range_get_inverted (GTK_RANGE (widget)))
 						y--;
@@ -534,7 +536,8 @@
 					width++;
 				}
 			}
-			if (adjustment->value >= adjustment->upper - adjustment->page_size) {
+			if ((adjustment->value >= adjustment->upper - adjustment->page_size) &&
+			    (GTK_RANGE (widget)->has_stepper_a || GTK_RANGE (widget)->has_stepper_b)) {
 				if (orientation == GTK_ORIENTATION_VERTICAL) {
 					if (gtk_range_get_inverted (GTK_RANGE (widget)))
 						y--;