projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef0bfdc
)
Fix a memleak introduced by 0dd91ba0e2382a8f6177f501f8a0b26e0daf26a8, some cleanups
author
Mikael Magnusson
<mikachu@gmail.com>
Wed, 3 Aug 2011 21:01:28 +0000
(23:01 +0200)
committer
Mikael Magnusson
<mikachu@gmail.com>
Wed, 3 Aug 2011 21:01:28 +0000
(23:01 +0200)
obrender/theme.c
patch
|
blob
|
history
diff --git
a/obrender/theme.c
b/obrender/theme.c
index
85cdf4a
..
5f14065
100644
(file)
--- a/
obrender/theme.c
+++ b/
obrender/theme.c
@@
-303,20
+303,16
@@
RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
READ_COLOR("window.active.label.text.color", theme->title_focused_color,
RrColorNew(inst, 0x0, 0x0, 0x0));
READ_COLOR("window.active.label.text.color", theme->title_focused_color,
RrColorNew(inst, 0x0, 0x0, 0x0));
+ READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
+ RrColorCopy(theme->title_unfocused_color));
+
READ_COLOR_("osd.active.label.text.color",
"osd.label.text.color",
theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
READ_COLOR_("osd.active.label.text.color",
"osd.label.text.color",
theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
- READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
- RrColorCopy(theme->title_unfocused_color));
-
READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
- READ_COLOR("window.inactive.label.text.color",
- theme->title_unfocused_color,
- RrColorNew(inst, 0xff, 0xff, 0xff));
-
READ_COLOR("window.active.button.unpressed.image.color",
theme->titlebut_focused_unpressed_color,
RrColorNew(inst, 0, 0, 0));
READ_COLOR("window.active.button.unpressed.image.color",
theme->titlebut_focused_unpressed_color,
RrColorNew(inst, 0, 0, 0));
@@
-986,10
+982,7
@@
RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_focused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_focused_shadow_color)
theme->osd_text_active_shadow_color =
theme->a_focused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_focused_shadow_color)
theme->osd_text_active_shadow_color =
- RrColorNew(inst,
- theme->title_focused_shadow_color->r,
- theme->title_focused_shadow_color->g,
- theme->title_focused_shadow_color->b);
+ RrColorCopy(theme->title_focused_shadow_color);
else
theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_active_shadow_alpha =
else
theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_active_shadow_alpha =
@@
-1113,10
+1106,7
@@
RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_unfocused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_unfocused_shadow_color)
theme->osd_text_inactive_shadow_color =
theme->a_unfocused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_unfocused_shadow_color)
theme->osd_text_inactive_shadow_color =
- RrColorNew(inst,
- theme->title_unfocused_shadow_color->r,
- theme->title_unfocused_shadow_color->g,
- theme->title_unfocused_shadow_color->b);
+ RrColorCopy(theme->title_unfocused_shadow_color);
else
theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_inactive_shadow_alpha =
else
theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_inactive_shadow_alpha =