remove color_set flag remove check of color_set flag before rendering (we

2008-05-13  Robert Escriva  <me@robescriva.com>

        * src/ui/theme.h (struct): remove color_set flag
        * src/ui/theme.c (meta_color_spec_render,
          meta_color_spec_new_from_string): remove check of color_set flag
          before rendering (we always do it now).  Closes #511826.


svn path=/trunk/; revision=3708

3 files changed, 15 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index e7fe1931..d66798d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-13  Robert Escriva  <me@robescriva.com>
+
+        * src/ui/theme.h (struct): remove color_set flag
+        * src/ui/theme.c (meta_color_spec_render,
+          meta_color_spec_new_from_string): remove check of color_set flag
+          before rendering (we always do it now).  Closes #511826.
+
 2008-05-12  Thomas Thurman  <tthurman@gnome.org>
 
         * tools/xlib.py: Basic Python-based Xlib client for testing
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 48557212..c165e9ca 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1264,7 +1264,6 @@ meta_color_spec_new_from_string (const char *str,
       spec->data.blend.alpha = alpha;
       spec->data.blend.background = bg;
       spec->data.blend.foreground = fg;
-      spec->data.blend.color_set = FALSE;
     }
   else if (str[0] == 's' && str[1] == 'h' && str[2] == 'a' && str[3] == 'd' &&
            str[4] == 'e' && str[5] == '/')
@@ -1323,7 +1322,6 @@ meta_color_spec_new_from_string (const char *str,
       spec = meta_color_spec_new (META_COLOR_SPEC_SHADE);
       spec->data.shade.factor = factor;
       spec->data.shade.base = base;
-      spec->data.shade.color_set = FALSE;
     }
   else
     {
@@ -1411,15 +1409,11 @@ meta_color_spec_render (MetaColorSpec *spec,
       {
         GdkColor bg, fg;
 
-        if (spec->data.blend.color_set == FALSE)
-          {
-            meta_color_spec_render (spec->data.blend.background, widget, &bg);
-            meta_color_spec_render (spec->data.blend.foreground, widget, &fg);
+        meta_color_spec_render (spec->data.blend.background, widget, &bg);
+        meta_color_spec_render (spec->data.blend.foreground, widget, &fg);
 
-            color_composite (&bg, &fg, spec->data.blend.alpha, 
-                             &spec->data.blend.color);
-            spec->data.blend.color_set = TRUE;
-          }
+        color_composite (&bg, &fg, spec->data.blend.alpha, 
+                         &spec->data.blend.color);
 
         *color = spec->data.blend.color;
       }
@@ -1427,15 +1421,11 @@ meta_color_spec_render (MetaColorSpec *spec,
 
     case META_COLOR_SPEC_SHADE:
       {
-        if (spec->data.shade.color_set == FALSE)
-          {
-            meta_color_spec_render (spec->data.shade.base, widget, 
-                                    &spec->data.shade.color);
+        meta_color_spec_render (spec->data.shade.base, widget, 
+                                &spec->data.shade.color);
             
-            gtk_style_shade (&spec->data.shade.color, 
-                             &spec->data.shade.color, spec->data.shade.factor);
-            spec->data.shade.color_set = TRUE;
-          }
+        gtk_style_shade (&spec->data.shade.color, 
+                         &spec->data.shade.color, spec->data.shade.factor);
 
         *color = spec->data.shade.color;
       }
diff --git a/src/ui/theme.h b/src/ui/theme.h
index fce715a8..be6114f3 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -259,14 +259,12 @@ struct _MetaColorSpec
       MetaColorSpec *background;
       double alpha;
 
-      gboolean color_set;
       GdkColor color;
     } blend;
     struct {
       MetaColorSpec *base;
       double factor;
 
-      gboolean color_set;
       GdkColor color;
     } shade;
   } data;