diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/theme.c | 20 | ||||
| -rw-r--r-- | render/theme.h | 6 |
2 files changed, 20 insertions, 6 deletions
diff --git a/render/theme.c b/render/theme.c index e61974e6..e658d873 100644 --- a/render/theme.c +++ b/render/theme.c @@ -73,6 +73,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) theme->app_hilite_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0); + theme->app_hilite_fg = RrAppearanceNew(inst, 0); + theme->app_unhilite_fg = RrAppearanceNew(inst, 0); theme->app_hilite_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1); @@ -478,12 +480,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.active.label.bg", theme->app_hilite_label, TRUE)) set_default_appearance(theme->app_hilite_label); + if (!read_appearance(db, inst, + "window.active.label.bg", theme->app_hilite_fg, + TRUE)) + set_default_appearance(theme->app_hilite_fg); else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) { if (!read_appearance(db, inst, "window.active.title.bg", - theme->app_hilite_label, + theme->app_hilite_fg, FALSE)) - set_default_appearance(theme->app_hilite_label); + set_default_appearance(theme->app_hilite_fg); } if (!read_appearance(db, inst, "window.inactive.title.bg", theme->app_unhilite_bg, @@ -493,12 +499,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name) "window.inactive.label.bg", theme->app_unhilite_label, TRUE)) set_default_appearance(theme->app_unhilite_label); + if (!read_appearance(db, inst, + "window.inactive.label.bg", theme->app_unhilite_fg, + TRUE)) + set_default_appearance(theme->app_unhilite_fg); else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) { if (!read_appearance(db, inst, "window.inactive.title.bg", - theme->app_unhilite_label, + theme->app_unhilite_fg, FALSE)) - set_default_appearance(theme->app_unhilite_label); + set_default_appearance(theme->app_unhilite_fg); } @@ -1037,6 +1047,8 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->app_hilite_bg); RrAppearanceFree(theme->app_unhilite_bg); + RrAppearanceFree(theme->app_hilite_fg); + RrAppearanceFree(theme->app_unhilite_fg); RrAppearanceFree(theme->app_hilite_label); RrAppearanceFree(theme->app_unhilite_label); } diff --git a/render/theme.h b/render/theme.h index 5c6507eb..1985e4ae 100644 --- a/render/theme.h +++ b/render/theme.h @@ -158,8 +158,10 @@ struct _RrTheme { RrAppearance *app_hilite_bg; RrAppearance *app_unhilite_bg; - RrAppearance *app_hilite_label; - RrAppearance *app_unhilite_label; + RrAppearance *app_hilite_fg; /* never parent relative */ + RrAppearance *app_unhilite_fg; /* never parent relative */ + RrAppearance *app_hilite_label; /* can be parent relative */ + RrAppearance *app_unhilite_label; /* can be parent relative */ }; |