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

[acimitan svn gnome org]

Author: acimitan
Date: Tue Feb  5 19:26:45 2008
New Revision: 1059
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1059&view=rev

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

	* engines/clearlooks/src/clearlooks_draw_gummy.c:
	(clearlooks_gummy_draw_menuitem):
	* engines/clearlooks/src/clearlooks_style.c:
	(clearlooks_style_draw_box):
	* themes/Clearlooks/gtk-2.0/gtkrc:
	Should read shadow... works on buttons but not for toolbars.
	Modded gtkrc to TEST.


Modified:
   trunk/ChangeLog
   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_gummy.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw_gummy.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw_gummy.c	Tue Feb  5 19:26:45 2008
@@ -1317,10 +1317,7 @@
 	ge_shade_color (fill, SHADE_BOTTOM, &shade3);
 	cairo_set_line_width (cr, 1.0);
 
-	if (params->radius == 0)
-		cairo_rectangle (cr, x-0.5, y+0.5, width + 1, height - 1);
-	else
-		ge_cairo_rounded_rectangle (cr, x+0.5, y+0.5, width - 1, height - 1, params->radius, params->corners);
+	ge_cairo_rounded_rectangle (cr, x+0.5, y+0.5, width - 1, height - 1, params->radius, params->corners);
 
 	pattern = cairo_pattern_create_linear (x, y, x, y + height);
 	cairo_pattern_add_color_stop_rgb (pattern, 0,   shade1.r, shade1.g, shade1.b);

Modified: trunk/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_style.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_style.c	Tue Feb  5 19:26:45 2008
@@ -472,8 +472,9 @@
 
 		menubar.style = clearlooks_style->menubarstyle;
 
-		STYLE_FUNCTION(draw_menubar) (cr, colors, &params, &menubar,
-		                              x, y, width, height);
+		if (shadow_type != GTK_SHADOW_NONE)
+			STYLE_FUNCTION(draw_menubar) (cr, colors, &params, &menubar,
+			                              x, y, width, height);
 	}
 	else if (DETAIL ("button") && CHECK_HINT (GE_HINT_TREEVIEW_HEADER))
 	{
@@ -835,7 +836,8 @@
 		toolbar.style = clearlooks_style->toolbarstyle;
 
 		/* Only draw the shadows on horizontal toolbars */
-		if (shadow_type != GTK_SHADOW_NONE && height < 2*width )
+		/* if (shadow_type != GTK_SHADOW_NONE && height < 2*width) */
+		if (shadow_type != GTK_SHADOW_NONE)
 			STYLE_FUNCTION(draw_toolbar) (cr, colors, &params, &toolbar, x, y, width, height);
 	}
 	else if (DETAIL ("trough"))

Modified: trunk/themes/Clearlooks/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Clearlooks/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Clearlooks/gtk-2.0/gtkrc	Tue Feb  5 19:26:45 2008
@@ -30,6 +30,8 @@
 
 	GtkMenu        ::horizontal-padding   = 0
 	GtkMenu        ::vertical-padding     = 0
+	GtkMenuBar::shadow-type = GTK_SHADOW_NONE
+	GtkToolbar::shadow-type = GTK_SHADOW_NONE
 
 	# Glow the tasklist by changing the color, instead of overlaying it with a rectangle
 	WnckTasklist   ::fade-overlay-rect    = 0
@@ -117,7 +119,7 @@
 
 style "clearlooks-menu"
 {
-	xthickness = 1
+	xthickness = 0
 	ythickness = 0
 
 	bg[NORMAL] = shade (1.08, @bg_color)
@@ -398,4 +400,4 @@
 		toolbarstyle = 0
 	}
 }
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround"
\ No newline at end of file
+widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround"