gtk-engines r1197 - in trunk: . engines/clearlooks/src

[acimitan svn gnome org]

Author: acimitan
Date: Mon May 12 01:46:38 2008
New Revision: 1197
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1197&view=rev

Log:
2008-05-12  Andrea Cimitan  <andrea cimitan gmail com>

	* engines/clearlooks/src/clearlooks_draw.c
	(clearlooks_draw_button):
	Changed look of default, get rid of the ugly rectangle.
	Maybe I should add a little shadow.

	* engines/clearlooks/src/clearlooks_style.c
	(clearlooks_style_draw_shadow):
	Changed border for scrolled_window


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/clearlooks_draw.c
   trunk/engines/clearlooks/src/clearlooks_style.c

Modified: trunk/engines/clearlooks/src/clearlooks_draw.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw.c	Mon May 12 01:46:38 2008
@@ -381,13 +381,7 @@
 	/* Drawing the border */
 	if (!params->active && params->is_default)
 	{
-		const CairoColor *l = &colors->shade[4];
-		const CairoColor *d = &colors->shade[4];
-		ge_cairo_set_color (cr, l);
-		ge_cairo_stroke_rectangle (cr, 2.5, 2.5, width-5, height-5);
-
-		ge_cairo_set_color (cr, d);
-		ge_cairo_stroke_rectangle (cr, 3.5, 3.5, width-7, height-7);
+		ge_shade_color (&border_normal, 0.74, &border_normal);
 	}
 
 	ge_cairo_inner_rounded_rectangle (cr, xoffset, yoffset, width-(xoffset*2), height-(yoffset*2), radius, params->corners);
@@ -399,7 +393,8 @@
 	else
 	{
 		if (!params->active)
-			clearlooks_set_border_gradient (cr, &border_normal, 1.3, 0, height);
+			clearlooks_set_border_gradient (cr, &border_normal,
+			                                params->is_default ? 1.1 : 1.3, 0, height);
 		else
 		{
 			ge_shade_color (&border_normal, 1.08, &border_normal);

Modified: trunk/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_style.c	Mon May 12 01:46:38 2008
@@ -215,9 +215,15 @@
 	}
 	else if (DETAIL ("scrolled_window") || DETAIL ("viewport") || detail == NULL)
 	{
-		CairoColor *border = (CairoColor*)&colors->shade[CLEARLOOKS_STYLE (style)->style == CL_STYLE_CLASSIC ? 3 : 5];
+		CairoColor border;
+
+		if (CLEARLOOKS_STYLE (style)->style == CL_STYLE_CLASSIC)
+			ge_shade_color ((CairoColor*)&colors->bg[0], 0.78, &border);
+		else
+			border = (CairoColor)colors->shade[5];
+
 		cairo_rectangle (cr, x+0.5, y+0.5, width-1, height-1);
-		ge_cairo_set_color (cr, border);
+		ge_cairo_set_color (cr, &border);
 		cairo_set_line_width (cr, 1);
 		cairo_stroke (cr);
 	}