diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-22 12:31:26 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-22 12:31:26 -0500 |
| commit | 97de73776708d7c75b42c8fcf33342541d721c83 (patch) | |
| tree | ffeaae16ca8c9e248062cb04a3266964735c4488 /render/theme.c | |
| parent | 198d98986bdf224ed29361541d19841339953088 (diff) | |
| parent | d9e6aa5643e74ab84fde0ddb1fcb8418ff212281 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/menuframe.c
openbox/prompt.c
openbox/prop.c
openbox/prop.h
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/render/theme.c b/render/theme.c index 1dad8e4c..ece4037c 100644 --- a/render/theme.c +++ b/render/theme.c @@ -211,6 +211,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, if (!read_int(db, "window.client.padding.height", &theme->cbwidthy) || theme->cbwidthy < 0 || theme->cbwidthy > 100) theme->cbwidthy = theme->cbwidthx; + if (!read_int(db, "menu.separator.width", &theme->menu_sep_width) || + theme->menu_sep_width < 1 || theme->menu_sep_width > 100) + theme->menu_sep_width = 1; + if (!read_int(db, "menu.separator.padding.width", + &theme->menu_sep_paddingx) || + theme->menu_sep_paddingx < 0 || theme->menu_sep_paddingx > 100) + theme->menu_sep_paddingx = 6; + if (!read_int(db, "menu.separator.padding.height", + &theme->menu_sep_paddingy) || + theme->menu_sep_paddingy < 0 || theme->menu_sep_paddingy > 100) + theme->menu_sep_paddingy = 3; /* load colors */ if (!read_color(db, inst, @@ -408,6 +419,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, "menu.items.active.text.color", &theme->menu_selected_color)) theme->menu_selected_color = RrColorNew(inst, 0, 0, 0); + if (!read_color(db, inst, + "menu.separator.color", &theme->menu_sep_color)) + theme->menu_sep_color = RrColorNew(inst, + theme->menu_color->r, + theme->menu_color->g, + theme->menu_color->b); /* load the image masks */ @@ -1418,6 +1435,7 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->titlebut_focused_unpressed_color); RrColorFree(theme->titlebut_unfocused_unpressed_color); RrColorFree(theme->menu_title_color); + RrColorFree(theme->menu_sep_color); RrColorFree(theme->menu_color); RrColorFree(theme->menu_selected_color); RrColorFree(theme->menu_disabled_color); |