[cairo-commit] cairo-gtk-engine/src caligula-rc-style.c, 1.2, 1.3 caligula-style.c, 1.5, 1.6 caligula.h, 1.2, 1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-gtk-engine/src
In directory gabe:/tmp/cvs-serv847/src

Modified Files:
	caligula-rc-style.c caligula-style.c caligula.h 
Log Message:

        * src/caligula.h:
        * src/caligula-style.c (caligula_draw_box):
        * src/caligula-rc-style.c (caligula_rc_style_init)
        (caligula_rc_style_merge): Add CALIGULA_DRAWING_STYLE_DEFAULT so
        that the merge doesn't override the drawing-style property.


Index: caligula-rc-style.c
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula-rc-style.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- caligula-rc-style.c	10 Feb 2005 20:44:33 -0000	1.2
+++ caligula-rc-style.c	11 Feb 2005 15:52:00 -0000	1.3
@@ -74,7 +74,7 @@
 static void
 caligula_rc_style_init (CaligulaRcStyle *rc_style)
 {
-    rc_style->drawing_style = CALIGULA_DRAWING_STYLE_GRASSY;
+    rc_style->drawing_style = CALIGULA_DRAWING_STYLE_DEFAULT;
 }
 
 static void
@@ -227,10 +227,11 @@
 {
     if (CALIGULA_IS_RC_STYLE (src)) {
 
-      CaligulaRcStyle *caligula_dest = CALIGULA_RC_STYLE (dest);
-      CaligulaRcStyle *caligula_src = CALIGULA_RC_STYLE (src);
+	CaligulaRcStyle *caligula_dest = CALIGULA_RC_STYLE (dest);
+	CaligulaRcStyle *caligula_src = CALIGULA_RC_STYLE (src);
 
-      caligula_dest->drawing_style = caligula_src->drawing_style;
+	if (caligula_src->drawing_style != CALIGULA_DRAWING_STYLE_DEFAULT)
+	    caligula_dest->drawing_style = caligula_src->drawing_style;
     }
 
     parent_class->merge (dest, src);

Index: caligula-style.c
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula-style.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- caligula-style.c	11 Feb 2005 15:27:26 -0000	1.5
+++ caligula-style.c	11 Feb 2005 15:52:00 -0000	1.6
@@ -129,6 +129,7 @@
 	caligula_draw_swirly_box (cr, x, y, width, height);
 	break;
     case CALIGULA_DRAWING_STYLE_GRASSY:
+    case CALIGULA_DRAWING_STYLE_DEFAULT:
     default:
 	caligula_draw_grassy_box (cr, x, y, width, height);
 	break;

Index: caligula.h
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- caligula.h	10 Feb 2005 20:44:33 -0000	1.2
+++ caligula.h	11 Feb 2005 15:52:00 -0000	1.3
@@ -34,6 +34,7 @@
 theme_create_rc_style (void);
 
 typedef enum {
+    CALIGULA_DRAWING_STYLE_DEFAULT,
     CALIGULA_DRAWING_STYLE_GRASSY,
     CALIGULA_DRAWING_STYLE_SWIRLY,
     CALIGULA_DRAWING_STYLE_SKETCHY