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

simplify

Browse source
This commit is contained in:
Dana Jansens 2003-10-11 06:45:41 +00:00
parent 35e3370651
commit 3740966916
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
render/theme.c
View file

@ -90,11 +90,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear = RrAppearanceNew(inst, 0);
theme->a_clear_tex = RrAppearanceNew(inst, 1); theme->a_clear_tex = RrAppearanceNew(inst, 1);
theme->app_hilite_bg = RrAppearanceNew(inst, 0);
theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
theme->app_hilite_label = RrAppearanceNew(inst, 1);
theme->app_unhilite_label = RrAppearanceNew(inst, 1);
if (name) { if (name) {
db = loaddb(theme, name); db = loaddb(theme, name);
if (db == NULL) { if (db == NULL) {
@ -489,26 +484,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
set_default_appearance(theme->a_menu_selected); set_default_appearance(theme->a_menu_selected);
/* read the appearances for rendering non-decorations */ /* read the appearances for rendering non-decorations */
if (!read_appearance(db, inst, theme->app_hilite_bg = RrAppearanceCopy(theme->a_focused_title);
"window.active.title.bg", theme->app_hilite_bg, theme->app_hilite_label = RrAppearanceCopy(theme->a_focused_label);
FALSE))
set_default_appearance(theme->app_hilite_bg);
if (!read_appearance(db, inst,
"window.active.label.bg", theme->app_hilite_label,
TRUE))
set_default_appearance(theme->app_hilite_label);
if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL) if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL)
theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label); theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label);
else else
theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title); theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title);
if (!read_appearance(db, inst, theme->app_unhilite_bg = RrAppearanceCopy(theme->a_unfocused_title);
"window.inactive.title.bg", theme->app_unhilite_bg, theme->app_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label);
FALSE))
set_default_appearance(theme->app_unhilite_bg);
if (!read_appearance(db, inst,
"window.inactive.label.bg", theme->app_unhilite_label,
TRUE))
set_default_appearance(theme->app_unhilite_label);
if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL) if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL)
theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label); theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label);
else else