diff options
| author | Dave Foster <daf@minuslab.net> | 2007-12-18 14:11:04 -0500 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2010-10-14 15:54:48 +0200 |
| commit | 464ee8996e6478e8bd6fc8c8e9df220187c51786 (patch) | |
| tree | 9a812684b7bb8c15149494dc2bc298d26c30bd9e | |
| parent | 3c8840a6ccd37d14ec0c1b25caa750b868240205 (diff) | |
Menu bullet color support.
| -rw-r--r-- | obrender/theme.c | 15 | ||||
| -rw-r--r-- | obrender/theme.h | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/obrender/theme.c b/obrender/theme.c index 442c8b89..29db238b 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -371,6 +371,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR("menu.items.text.color", theme->menu_color, RrColorNew(inst, 0xff, 0xff, 0xff)); + READ_COLOR("menu.bullet.image.color", theme->menu_bullet_color, + RrColorCopy(theme->menu_color)); + READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color, RrColorNew(inst, 0, 0, 0)); @@ -383,7 +386,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, READ_COLOR("menu.separator.color", theme->menu_sep_color, RrColorCopy(theme->menu_color)); - + + READ_COLOR("menu.bullet.selected.image.color", + theme->menu_bullet_selected_color, + RrColorCopy(theme->menu_selected_color)); + /* load the image masks */ /* maximize button masks */ @@ -1456,9 +1463,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = theme->btn_iconify->unfocused_pressed_color; theme->a_menu_bullet_normal->texture[0].data.mask.color = - theme->menu_color; + theme->menu_bullet_color; theme->a_menu_bullet_selected->texture[0].data.mask.color = - theme->menu_selected_color; + theme->menu_bullet_selected_color; g_free(path); XrmDestroyDatabase(db); @@ -1565,6 +1572,8 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->menu_title_color); RrColorFree(theme->menu_sep_color); RrColorFree(theme->menu_color); + RrColorFree(theme->menu_bullet_color); + RrColorFree(theme->menu_bullet_selected_color); RrColorFree(theme->menu_selected_color); RrColorFree(theme->menu_disabled_color); RrColorFree(theme->menu_disabled_selected_color); diff --git a/obrender/theme.h b/obrender/theme.h index bbb55718..3844e6da 100644 --- a/obrender/theme.h +++ b/obrender/theme.h @@ -90,6 +90,8 @@ struct _RrTheme { RrColor *menu_title_color; RrColor *menu_sep_color; RrColor *menu_color; + RrColor *menu_bullet_color; + RrColor *menu_bullet_selected_color; RrColor *menu_selected_color; RrColor *menu_disabled_color; RrColor *menu_disabled_selected_color; |