metacity r3708 - in trunk: . src/ui

[tthurman svn gnome org]

Author: tthurman
Date: Tue May 13 12:53:36 2008
New Revision: 3708
URL: http://svn.gnome.org/viewvc/metacity?rev=3708&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/src/ui/theme.c
   trunk/src/ui/theme.h

Modified: trunk/src/ui/theme.c
==============================================================================
--- trunk/src/ui/theme.c	(original)
+++ trunk/src/ui/theme.c	Tue May 13 12:53:36 2008
@@ -1264,7 +1264,6 @@
       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 @@
       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 @@
       {
         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 @@
 
     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;
       }

Modified: trunk/src/ui/theme.h
==============================================================================
--- trunk/src/ui/theme.h	(original)
+++ trunk/src/ui/theme.h	Tue May 13 12:53:36 2008
@@ -259,14 +259,12 @@
       MetaColorSpec *background;
       double alpha;
 
-      gboolean color_set;
       GdkColor color;
     } blend;
     struct {
       MetaColorSpec *base;
       double factor;
 
-      gboolean color_set;
       GdkColor color;
     } shade;
   } data;