gtk-engines r1154 - in trunk: . engines/clearlooks/src engines/industrial/src engines/mist/src

[bberg svn gnome org]

Author: bberg
Date: Wed Apr  9 20:28:45 2008
New Revision: 1154
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1154&view=rev

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

	* engines/clearlooks/src/support.c:
	(clearlooks_scrollbar_get_junction):
	* engines/industrial/src/industrial_style.c: (draw_slider):
	* engines/mist/src/mist-style.c: (mist_style_draw_box):
	Fix part 1 of bug #526890 in all affected engines. (Inverted
	scrollbars should work fine now, stepper buttons are still ignored.)


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/support.c
   trunk/engines/industrial/src/industrial_style.c
   trunk/engines/mist/src/mist-style.c

Modified: trunk/engines/clearlooks/src/support.c
==============================================================================
--- trunk/engines/clearlooks/src/support.c	(original)
+++ trunk/engines/clearlooks/src/support.c	Wed Apr  9 20:28:45 2008
@@ -203,13 +203,19 @@
 	if (adj->value <= adj->lower &&
 		(GTK_RANGE (widget)->has_stepper_a || GTK_RANGE (widget)->has_stepper_b))
 	{
-		junction |= CL_JUNCTION_BEGIN;
+		if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+			junction |= CL_JUNCTION_BEGIN;
+		else
+			junction |= CL_JUNCTION_END;
 	}
 	
 	if (adj->value >= adj->upper - adj->page_size &&
 		(GTK_RANGE (widget)->has_stepper_c || GTK_RANGE (widget)->has_stepper_d))
 	{
-		junction |= CL_JUNCTION_END;
+		if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+			junction |= CL_JUNCTION_END;
+		else
+			junction |= CL_JUNCTION_BEGIN;
 	}
 	
 	return junction;

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 20:28:45 2008
@@ -525,17 +525,23 @@
 		    adjustment->page_size) {
 			if (adjustment->value <= adjustment->lower) {
 				if (orientation == GTK_ORIENTATION_VERTICAL) {
-					y--;
+					if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+						y--;
 					height++;
 				} else {
-					x--;
+					if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+						x--;
 					width++;
 				}
 			}
 			if (adjustment->value >= adjustment->upper - adjustment->page_size) {
 				if (orientation == GTK_ORIENTATION_VERTICAL) {
+					if (gtk_range_get_inverted (GTK_RANGE (widget)))
+						y--;
 					height++;
 				} else {
+					if (gtk_range_get_inverted (GTK_RANGE (widget)))
+						x--;
 					width++;
 				}
 			}

Modified: trunk/engines/mist/src/mist-style.c
==============================================================================
--- trunk/engines/mist/src/mist-style.c	(original)
+++ trunk/engines/mist/src/mist-style.c	Wed Apr  9 20:28:45 2008
@@ -603,10 +603,12 @@
 			     GTK_RANGE (widget)->has_stepper_b)) {
 				if (GE_IS_VSCROLLBAR (widget)) {
 					height += 1;
-					y -= 1;
+					if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+						y -= 1;
 				} else if (GE_IS_HSCROLLBAR (widget)) {
 					width += 1;
-					x -= 1;
+					if (!gtk_range_get_inverted (GTK_RANGE (widget)))
+						x -= 1;
 				}
 			}
 			
@@ -615,8 +617,12 @@
 			     GTK_RANGE (widget)->has_stepper_d)) {
 				if (GE_IS_VSCROLLBAR (widget)) {
 					height += 1;
+					if (gtk_range_get_inverted (GTK_RANGE (widget)))
+						y -= 1;
 				} else if (GE_IS_HSCROLLBAR (widget)) {
 					width += 1;
+					if (gtk_range_get_inverted (GTK_RANGE (widget)))
+						x -= 1;
 				}
 			}
 		}