nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add app_(un)hilite_fg, which is never parentrelative

Browse source
This commit is contained in:
Dana Jansens 2003-09-12 05:56:57 +00:00
parent 4685a11530
commit 5d658c98e2
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
render/theme.c
View file

@ -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);
}

6
render/theme.h
View file

@ -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 */
};