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

[acimitan svn gnome org]

Author: acimitan
Date: Tue Feb 26 22:07:35 2008
New Revision: 1103
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1103&view=rev

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

	* engines/clearlooks/src/clearlooks_draw.c:
	(clearlooks_draw_scrollbar_trough), (clearlooks_draw_menu_frame):
	* engines/clearlooks/src/clearlooks_draw_gummy.c:
	(clearlooks_gummy_draw_scrollbar_stepper):
	* engines/clearlooks/src/clearlooks_style.c:
	(clearlooks_style_draw_box):
	Fixed problems with big radius, fixes #395013
	(I mean fixes everything that can be fixed with Gtk 2.x)



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

Modified: trunk/engines/clearlooks/src/clearlooks_draw.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw.c	Tue Feb 26 22:07:35 2008
@@ -1601,6 +1601,7 @@
 	const CairoColor *border = &colors->shade[5];
 	CairoColor        bg_shade;
 	cairo_pattern_t *pattern;
+	double radius = MIN (widget->radius, MIN ((width - 2.0) / 2.0, (height - 2.0) / 2.0));
 
 	ge_shade_color (bg, 0.95, &bg_shade);
 
@@ -1613,7 +1614,11 @@
 	cairo_translate (cr, x, y);
 
 	/* Draw fill */
-	cairo_rectangle (cr, 1, 0, width-2, height);
+	if (radius > 3.0)
+		ge_cairo_rounded_rectangle (cr, 1, 0, width-2, height,
+		                            radius, widget->corners);
+	else
+		cairo_rectangle (cr, 1, 0, width-2, height);
 	ge_cairo_set_color (cr, bg);
 	cairo_fill (cr);
 
@@ -1627,8 +1632,13 @@
 	cairo_pattern_destroy (pattern);
 
 	/* Draw border */
+	if (radius > 3.0)
+		ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1,
+		                            radius, widget->corners);
+	else
+		cairo_rectangle (cr, 0.5, 0.5, width-1, height-1);
 	ge_cairo_set_color (cr, border);
-	ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1);
+	cairo_stroke (cr);
 }
 
 static void
@@ -1864,11 +1874,7 @@
 	const CairoColor *border = &colors->shade[5];
 	cairo_translate      (cr, x, y);
 	cairo_set_line_width (cr, 1);
-/*
-	cairo_set_source_rgba (cr, colors->bg[0].r, colors->bg[0].g, colors->bg[0].b, 0.9);
-	cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-	cairo_paint          (cr);
-*/
+
 	ge_cairo_set_color (cr, border);
 	ge_cairo_stroke_rectangle (cr, 0.5, 0.5, width-1, height-1);
 }

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 26 22:07:35 2008
@@ -1051,7 +1051,8 @@
 	cairo_pattern_destroy (pattern);
 
 	cairo_translate (cr, 0.5, 0.5);
-	clearlooks_gummy_draw_top_left_highlight (cr, &fill, widget, width, height, (stepper->stepper == CL_STEPPER_A) ? radius : 0);
+	clearlooks_gummy_draw_top_left_highlight (cr, &fill, widget, width, height,
+	                                          (stepper->stepper == CL_STEPPER_A) ? radius : 0);
 	cairo_translate (cr, -0.5, -0.5);
 
 	ge_cairo_rounded_rectangle (cr, 0.5, 0.5, width-1, height-1, radius, corners);

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 26 22:07:35 2008
@@ -645,7 +645,7 @@
 		ScrollBarParameters scrollbar;
 
 		clearlooks_set_widget_parameters (widget, style, state_type, &params);
-		params.corners = CR_CORNER_NONE;
+		params.corners = CR_CORNER_ALL;
 
 		scrollbar.horizontal = TRUE;
 		scrollbar.junction   = clearlooks_scrollbar_get_junction (widget);