add app_(un)hilite_fg, which is never parentrelative
Dana Jansens danakj@orodu.net
2 files changed,
20 insertions(+),
6 deletions(-)
M
render/theme.c
→
render/theme.c
@@ -73,6 +73,8 @@ theme->a_clear_tex = RrAppearanceNew(inst, 1);
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 @@ if (!read_appearance(db, inst,
"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 @@ if (!read_appearance(db, inst,
"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 @@ RrAppearanceFree(theme->a_clear);
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); }
M
render/theme.h
→
render/theme.h
@@ -158,8 +158,10 @@ RrAppearance *a_clear_tex; /* clear with a texture */
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 */ };