summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorRobert Escriva <me@robescriva.com>2008-05-13 12:53:36 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-05-13 12:53:36 +0000
commit53b9e49ca4972ec76b126dc901d15ab274d86d94 (patch)
treedcaa562d95d0f4d1b81873f0117c55ef0dc9ae7e /src/ui
parent8547d1e8ed7c7b296e2626e72d8c2aeef5406567 (diff)
downloadmetacity-53b9e49ca4972ec76b126dc901d15ab274d86d94.tar.gz
metacity-53b9e49ca4972ec76b126dc901d15ab274d86d94.tar.bz2
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
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/theme.c26
-rw-r--r--src/ui/theme.h2
2 files changed, 8 insertions, 20 deletions
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 4855721..c165e9c 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 fce715a..be6114f 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;