murrine r137 - in trunk: . src

[acimitan svn gnome org]

Author: acimitan
Date: Mon Feb  2 17:28:18 2009
New Revision: 137
URL: http://svn.gnome.org/viewvc/murrine?rev=137&view=rev

Log:
2009-02-02  Andrea Cimitan  <andrea cimitan gmail com>

	* src/murrine_draw.c (murrine_draw_tab):
	* src/murrine_draw_rgba.c (murrine_rgba_draw_tab):
	* src/murrine_style.c (murrine_style_draw_box):
	Draw rounded scrollbar's sliders when trough-under-steppers is 0.


Modified:
   trunk/ChangeLog
   trunk/src/murrine_draw.c
   trunk/src/murrine_draw_rgba.c
   trunk/src/murrine_style.c

Modified: trunk/src/murrine_draw.c
==============================================================================
--- trunk/src/murrine_draw.c	(original)
+++ trunk/src/murrine_draw.c	Mon Feb  2 17:28:18 2009
@@ -930,7 +930,6 @@
                   const TabParameters    *tab,
                   int x, int y, int width, int height)
 {
-	const float      RADIUS = 3.0;
 	const MurrineRGB *stripe_fill = &colors->spot[1];
 	const MurrineRGB *stripe_border = &colors->spot[2];
 	const MurrineRGB *fill = &colors->bg[widget->state_type];
@@ -948,14 +947,14 @@
 	/* And calculate the strip size too, while you're at it */
 	if (tab->gap_side == MRN_GAP_TOP || tab->gap_side == MRN_GAP_BOTTOM)
 	{
-		height += RADIUS;
+		height += 3.0;
 
 		if (tab->gap_side == MRN_GAP_TOP)
 			cairo_translate (cr, 0.0, -3.0); /* gap at the other side */
 	}
 	else
 	{
-		width += RADIUS;
+		width += 3.0;
 
 		if (tab->gap_side == MRN_GAP_LEFT)
 			cairo_translate (cr, -3.0, 0.0); /* gap at the other side */

Modified: trunk/src/murrine_draw_rgba.c
==============================================================================
--- trunk/src/murrine_draw_rgba.c	(original)
+++ trunk/src/murrine_draw_rgba.c	Mon Feb  2 17:28:18 2009
@@ -928,7 +928,6 @@
                        const TabParameters    *tab,
                        int x, int y, int width, int height)
 {
-	const float      RADIUS = 3.0;
 	const MurrineRGB *stripe_fill = &colors->spot[1];
 	const MurrineRGB *stripe_border = &colors->spot[2];
 	const MurrineRGB *fill = &colors->bg[widget->state_type];
@@ -948,14 +947,14 @@
 	/* And calculate the strip size too, while you're at it */
 	if (tab->gap_side == MRN_GAP_TOP || tab->gap_side == MRN_GAP_BOTTOM)
 	{
-		height += RADIUS;
+		height += 3.0;
 
 		if (tab->gap_side == MRN_GAP_TOP)
 			cairo_translate (cr, 0.0, -3.0); /* gap at the other side */
 	}
 	else
 	{
-		width += RADIUS;
+		width += 3.0;
 
 		if (tab->gap_side == MRN_GAP_LEFT)
 			cairo_translate (cr, -3.0, 0.0); /* gap at the other side */

Modified: trunk/src/murrine_style.c
==============================================================================
--- trunk/src/murrine_style.c	(original)
+++ trunk/src/murrine_style.c	Mon Feb  2 17:28:18 2009
@@ -1094,7 +1094,7 @@
 			if (murrine_style->menustyle != 1 || (MRN_IS_MENU_BAR (widget->parent) && !murrine_style->menubaritemstyle))
 				STYLE_FUNCTION(draw_menuitem) (cr, colors, &params, x, y, width, height, murrine_style->menuitemstyle);
 			else
-				/* little translation */
+				/* little translation */ /* XXX: RTL */
 				STYLE_FUNCTION(draw_menuitem) (cr, colors, &params, x+3, y, width-3, height, murrine_style->menuitemstyle);
 		}
 
@@ -1152,9 +1152,16 @@
 		if (DETAIL ("slider"))
 		{
 			int trough_border = 0;
-			gtk_widget_style_get (widget, "trough-border", &trough_border, NULL);
+			int trough_under_steppers = 1;
 
-			if (trough_border > 0 || murrine_style->roundness == 1)
+			gtk_widget_style_get (widget,
+			                      "trough-border", &trough_border,
+			                      "trough-under-steppers", &trough_under_steppers,
+			                      NULL);
+
+			if (trough_border > 0 ||
+			    trough_under_steppers == 0 ||
+			    murrine_style->roundness == 1)
 				params.corners = MRN_CORNER_ALL;
 			else
 				params.corners = MRN_CORNER_NONE;