diff options
| -rw-r--r-- | obrender/theme.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/obrender/theme.c b/obrender/theme.c index 85cdf4ab..5f140657 100644 --- 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.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("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("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)); @@ -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 = - 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 = @@ -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 = - 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 = |