Changeset 3027

Timestamp:

09/21/07 16:26:35 (6 years ago)

Author:

thomas

Message:

• src/moko-style.c: (moko_rc_style_merge), (moko_rc_style_parse):
• src/moko-style.h:

Use bit flag to indicate which engine options have been set (fixes any
options not set in the first matched style)

Location:

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine

Files:

• ChangeLog (modified) (1 diff)
• src/moko-style.c (modified) (3 diffs)
• src/moko-style.h (modified) (1 diff)

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog

@@ +1 @@
+2007-09-21  Thomas Wood  <thomas@openedhand.com>
+
+        * src/moko-style.c: (moko_rc_style_merge), (moko_rc_style_parse):
+        * src/moko-style.h:
+
+        Use bit flag to indicate which engine options have been set (fixes any
+        options not set in the first matched style)
+
 2007-09-21  Thomas Wood  <thomas@openedhand.com>
 

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-style.c

@@ -108 +108 @@
   if (MOKO_IS_RC_STYLE (src))
   {
+    guint flags;
     MokoRcStyle *src_data = MOKO_RC_STYLE (src);
     MokoRcStyle *dest_data = MOKO_RC_STYLE (dest);
 
-    dest_data->has_border = src_data->has_border;
-    dest_data->has_gradient = src_data->has_gradient;
+    flags = (~dest_data->flags) & src_data->flags;
+
+    if (flags & BORDER_SET)
+      dest_data->has_border = src_data->has_border;
+
+    if (flags & GRADIENT_SET)
+      dest_data->has_gradient = src_data->has_gradient;
+
+    dest_data->flags = dest_data->flags | src_data->flags;
   }
 
@@ -183 +191 @@
           break;
         theme_data->has_border = i;
+        theme_data->flags = theme_data->flags | BORDER_SET;
         break;
       case TOKEN_HAS_GRADIENT:
@@ -189 +198 @@
           break;
         theme_data->has_gradient = i;
+        theme_data->flags = theme_data->flags | GRADIENT_SET;
         break;
 

trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/src/moko-style.h

@@ -76 +76 @@
 typedef struct _MokoRcStyleClass MokoRcStyleClass;
 
+/* which properties have been set? */
+enum {
+  BORDER_SET = 1,
+  GRADIENT_SET = 2
+};
+
 struct _MokoRcStyle
 {
   GtkRcStyle parent_instance;
 
+  guint flags;
   gboolean has_border;
   gboolean has_gradient;