gtk-css-engine r102 - in trunk: . libccd/ccd src themes/Gilouche-CSS/gtk-2.0 themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Thu Sep 11 12:59:57 2008
New Revision: 102
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=102&view=rev

Log:
* libccd/ccd/ccd-background.c:
* src/gce-style.c:
Fix background drawing both color and images are used.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/libccd/ccd/ccd-background.c
   trunk/src/gce-style.c
   trunk/themes/Gilouche-CSS/gtk-2.0/gtkrc
   trunk/themes/gtk-css-test/gtk-2.0/styles.css

Modified: trunk/libccd/ccd/ccd-background.c
==============================================================================
--- trunk/libccd/ccd/ccd-background.c	(original)
+++ trunk/libccd/ccd/ccd-background.c	Thu Sep 11 12:59:57 2008
@@ -85,6 +85,12 @@
 	return false;
 }
 
+/**
+ * ccd_background_draw:
+ *
+ * This function requires that a closed path exists, which is filled with 
+ * the background. The path is not modified.
+ **/
 void
 ccd_background_draw (ccd_background_color_t const	*bg_color, 
 		     ccd_background_image_t const	*bg_image,
@@ -104,8 +110,7 @@
 		cairo_set_source_rgb (cr, bg_color->color.red, 
 					  bg_color->color.green, 
 					  bg_color->color.blue);
-/*		cairo_rectangle (cr, x, y, width, height);*/
-		cairo_fill (cr);
+		cairo_fill_preserve (cr);
 	}
 
 	if (bg_image && bg_image->spec != CCD_PROPERTY_SPEC_UNSET) {
@@ -123,9 +128,7 @@
 
 		pattern = cairo_get_source (cr);
 		cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
-
-/*		cairo_rectangle (cr, x / dx, y / dy, width / dx, height / dy);*/
-		cairo_fill (cr);
+		cairo_fill_preserve (cr);
 	}
 
 	cairo_restore (cr);

Modified: trunk/src/gce-style.c
==============================================================================
--- trunk/src/gce-style.c	(original)
+++ trunk/src/gce-style.c	Thu Sep 11 12:59:57 2008
@@ -844,6 +844,9 @@
 	GceNode *node;
 	GceNode *base;
 
+if (GTK_IS_VSCROLLBAR (widget) && GTK_WIDGET_IS_SENSITIVE(widget) && arrow == GTK_ARROW_DOWN)
+	printf ("foo\n");
+
 	base = gce_node_cache_fetch_node ();
 	base->widget = widget;
 	base->class_name = gce_maps_get_detail (detail);

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Gilouche-CSS/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Gilouche-CSS/gtk-2.0/gtkrc	Thu Sep 11 12:59:57 2008
@@ -6,6 +6,7 @@
 	engine "css" 
 	{
 		href = "styles.css"
+		#href = "test.css"
 	}
 }
 widget_class "*" style "default"

Modified: trunk/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- trunk/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ trunk/themes/gtk-css-test/gtk-2.0/styles.css	Thu Sep 11 12:59:57 2008
@@ -106,7 +106,12 @@
 box {
 	background: khaki;
 	border: 1px solid black;
-	border-top: none;
 	border-top-left-radius: 2;
 	border-bottom-right-radius: 5;
 }
+
+arrow[orientation=down] {
+/*	background-image: url(arrow-down.png); */
+	background-image: url(foo.svg);
+}
+