gtk-engines r1353 - in trunk: . engines/clearlooks/src themes/Clearlooks/gtk-2.0

[acimitan svn gnome org]

Author: acimitan
Date: Wed Mar 18 10:55:09 2009
New Revision: 1353
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1353&view=rev

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

	* engines/clearlooks/src/clearlooks_draw.c (clearlooks_draw_entry):
	* engines/clearlooks/src/clearlooks_draw_gummy.c
	(clearlooks_gummy_draw_entry):
	* engines/clearlooks/src/clearlooks_style.c
	(clearlooks_style_draw_box):
	* themes/Clearlooks/gtk-2.0/gtkrc:
	Fixed the focus inner shadow in draw_entry.
	Fixed the focus_color in the gtkrc, needs to be backported in
	gnome-themes.


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/clearlooks_draw.c
   trunk/engines/clearlooks/src/clearlooks_draw_gummy.c
   trunk/engines/clearlooks/src/clearlooks_style.c
   trunk/themes/Clearlooks/gtk-2.0/gtkrc

Modified: trunk/engines/clearlooks/src/clearlooks_draw.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw.c	Wed Mar 18 10:55:09 2009
@@ -438,8 +438,10 @@
 	/* Draw the inner shadow */
 	if (params->focus)
 	{
-		/* XXX Fix this with focus->has_color */
-		ge_cairo_set_color (cr, &colors->spot[0]);
+		CairoColor focus_shadow;
+		ge_shade_color (&border, 1.61, &focus_shadow);
+		
+		clearlooks_set_mixed_color (cr, base, &focus_shadow, 0.5);
 		ge_cairo_inner_rounded_rectangle (cr, 2, 2, width-4, height-4, MAX(0, radius-1), params->corners);
 		cairo_stroke (cr);
 	}

Modified: trunk/engines/clearlooks/src/clearlooks_draw_gummy.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw_gummy.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw_gummy.c	Wed Mar 18 10:55:09 2009
@@ -286,8 +286,10 @@
 	/* Draw the inner shadow */
 	if (params->focus)
 	{
-		/* XXX Fix this with focus->has_color */
-		clearlooks_set_mixed_color (cr, base, &colors->spot[1], 0.5);
+		CairoColor focus_shadow;
+		ge_shade_color (&border, 1.61, &focus_shadow);
+		
+		clearlooks_set_mixed_color (cr, base, &focus_shadow, 0.5);
 		ge_cairo_inner_rounded_rectangle (cr, 2, 2, width-4, height-4, MAX(0, radius-1), params->corners);
 		cairo_stroke (cr);
 	}

Modified: trunk/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_style.c	Wed Mar 18 10:55:09 2009
@@ -911,7 +911,6 @@
 					gdk_drawable_get_size (widget->window,
 					                       &progress.max_size.width,
 					                       &progress.max_size.height);
-
 				}
 				else
 				{

Modified: trunk/themes/Clearlooks/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Clearlooks/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Clearlooks/gtk-2.0/gtkrc	Wed Mar 18 10:55:09 2009
@@ -102,7 +102,7 @@
 	fg[SELECTED] = @text_color
 
 	engine "clearlooks" {
-		focus_color = shade (0.896, @selected_bg_color)
+		focus_color = shade (0.65, @selected_bg_color)
 	}
 }