gtk-css-engine r145 - in trunk: . libccss/ccss themes/Gilouche-CSS/gtk-2.0 themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Wed Oct  1 10:41:50 2008
New Revision: 145
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=145&view=rev

Log:
* libccss/ccss/ccss-background.c: more robustness wrt bg-color.

* libccss/ccss/ccss-border.c: fix setting border to `none'.

* themes/Gilouche-CSS/gtk-2.0/styles.css: tweak roundings.



Modified:
   trunk/ChangeLog
   trunk/libccss/ccss/ccss-background.c
   trunk/libccss/ccss/ccss-border.c
   trunk/themes/Gilouche-CSS/gtk-2.0/styles.css
   trunk/themes/gtk-css-test/gtk-2.0/styles.css

Modified: trunk/libccss/ccss/ccss-background.c
==============================================================================
--- trunk/libccss/ccss/ccss-background.c	(original)
+++ trunk/libccss/ccss/ccss-background.c	Wed Oct  1 10:41:50 2008
@@ -426,7 +426,7 @@
 	double		dy;
 
 	g_return_if_fail (bg_attachment);
-	g_return_if_fail (bg_color);
+	/* FIXME, we need "transparent" color g_return_if_fail (bg_color); */
 	g_return_if_fail (bg_image);
 	g_return_if_fail (bg_position);
 	g_return_if_fail (bg_repeat);
@@ -434,7 +434,7 @@
 
 	cairo_save (cr);
 
-	if (ccss_property_is_set (bg_color->spec)) {
+	if (bg_color && ccss_property_is_set (bg_color->spec)) {
 
 		cairo_set_source_rgb (cr, bg_color->red, 
 					  bg_color->green, 

Modified: trunk/libccss/ccss/ccss-border.c
==============================================================================
--- trunk/libccss/ccss/ccss-border.c	(original)
+++ trunk/libccss/ccss/ccss-border.c	Wed Oct  1 10:41:50 2008
@@ -424,6 +424,7 @@
 	width_spec = parse_width (&iter, &width);
 	if (CCSS_PROPERTY_SPEC_NONE == width_spec && !iter) {
 		style_spec = CCSS_PROPERTY_SPEC_NONE;
+		color.spec = CCSS_PROPERTY_SPEC_NONE;
 	} else {
 		style_spec = parse_style (&iter, &style);
 		parse_color (&iter, &color);

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/styles.css
==============================================================================
--- trunk/themes/Gilouche-CSS/gtk-2.0/styles.css	(original)
+++ trunk/themes/Gilouche-CSS/gtk-2.0/styles.css	Wed Oct  1 10:41:50 2008
@@ -83,7 +83,7 @@
 }
 
 
-shadow.entry{
+GtkEntry > shadow {
 	border: 1px solid #948156;
 }
 
@@ -95,35 +95,35 @@
 
 /* GtkComboBox > GtkEntry > shadow ? */
 GtkComboBox > GtkEntry {
-	border-right: none;		/* TODO Rob: seems this doesn't work */
+	border-right: none;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
 
 GtkComboBox > GtkButton {
-	border-left: none;		/* TODO Rob: seems this doesn't work */
 	border-top-left-radius: 0px;
 	border-bottom-left-radius: 0px;
 }
 
 GtkCombo > GtkEntry {
-	border-right: none;		/* TODO Rob: seems this doesn't work */
+	border-right: none;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
 
 GtkCombo > GtkButton {
-	border-left: none;		/* TODO Rob: seems this doesn't work */
 	border-top-left-radius: 0px;
 	border-bottom-left-radius: 0px;
 }
 
-GtkSpinButton {
+/* spinbuttons */
+
+GtkSpinButton > shadow {
+	border-right: none;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }
 
-/* spinbuttons */
 GtkSpinButton > box.spinbutton-up {
 	background-image: url(arrow-up.svg);
 	background-position: center;
@@ -136,6 +136,11 @@
 	border-bottom-left-radius: 0px;
 }
 
+GtkSpinButton > arrow {
+	background-color: none;
+	background-image: none;
+}
+
 GtkSpinButton > box.spinbutton-down {
 	background-image: url(arrow-down.svg);
 	background-position: center;

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	Wed Oct  1 10:41:50 2008
@@ -92,6 +92,12 @@
 	border: 1px solid black;
 }
 
+GtkHScale > slider {
+	background-image: url(slider-test-h.png);
+	background-attachment: fixed;
+	border: 1px solid black;
+}
+
 extension {
 	border: 1px solid black;
 }