summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-10-11 06:45:41 +0000
committerDana Jansens <danakj@orodu.net>2003-10-11 06:45:41 +0000
commit374096691675da2c602c096632cac9f4a547215a (patch)
tree848996cb7c262ee49ddb957c34d9731135ddcb2c /render
parent35e3370651be572c710a09f6bb6190207c5dbd01 (diff)
simplify
Diffstat (limited to 'render')
-rw-r--r--render/theme.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/render/theme.c b/render/theme.c
index 40ec1c57..8ad64a7a 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -90,11 +90,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_clear = RrAppearanceNew(inst, 0);
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) {
db = loaddb(theme, name);
if (db == NULL) {
@@ -489,26 +484,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
set_default_appearance(theme->a_menu_selected);
/* read the appearances for rendering non-decorations */
- if (!read_appearance(db, inst,
- "window.active.title.bg", theme->app_hilite_bg,
- 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);
+ theme->app_hilite_bg = RrAppearanceCopy(theme->a_focused_title);
+ theme->app_hilite_label = RrAppearanceCopy(theme->a_focused_label);
if (theme->a_focused_label->surface.grad != RR_SURFACE_PARENTREL)
theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_label);
else
theme->app_hilite_fg = RrAppearanceCopy(theme->a_focused_title);
- if (!read_appearance(db, inst,
- "window.inactive.title.bg", theme->app_unhilite_bg,
- 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);
+ theme->app_unhilite_bg = RrAppearanceCopy(theme->a_unfocused_title);
+ theme->app_unhilite_label = RrAppearanceCopy(theme->a_unfocused_label);
if (theme->a_unfocused_label->surface.grad != RR_SURFACE_PARENTREL)
theme->app_unhilite_fg = RrAppearanceCopy(theme->a_unfocused_label);
else