diff options
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/render/theme.c b/render/theme.c index cf483977..ade6f6c5 100644 --- a/render/theme.c +++ b/render/theme.c @@ -115,7 +115,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_handle = RrAppearanceNew(inst, 0); theme->a_unfocused_handle = RrAppearanceNew(inst, 0); theme->a_menu = RrAppearanceNew(inst, 0); - theme->a_menu_title = RrAppearanceNew(inst, 1); + theme->a_menu_title = RrAppearanceNew(inst, 0); + theme->a_menu_text_title = RrAppearanceNew(inst, 1); theme->a_menu_normal = RrAppearanceNew(inst, 0); theme->a_menu_disabled = RrAppearanceNew(inst, 0); theme->a_menu_selected = RrAppearanceNew(inst, 0); @@ -567,7 +568,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, set_default_appearance(theme->a_unfocused_grip); if (!FIND(appearance, L("menu","entries"), theme->a_menu, FALSE)) set_default_appearance(theme->a_menu); - if (!FIND(appearance, L("menu","title"), theme->a_menu_title, FALSE)) + if (!FIND(appearance, L("menu","title"), theme->a_menu_title, TRUE)) set_default_appearance(theme->a_menu_title); if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); @@ -752,6 +753,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_icon->surface.grad = theme->a_clear->surface.grad = theme->a_clear_tex->surface.grad = + theme->a_menu_text_title->surface.grad = theme->a_menu_normal->surface.grad = theme->a_menu_disabled->surface.grad = theme->a_menu_text_normal->surface.grad = @@ -811,18 +813,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_unfocused_label->texture[0].data.text.shadow_alpha = theme->title_unfocused_shadow_alpha; - theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; - theme->a_menu_title->texture[0].data.text.justify = mtitlejust; - theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font; - theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color; + theme->a_menu_text_title->texture[0].type = RR_TEXTURE_TEXT; + theme->a_menu_text_title->texture[0].data.text.justify = mtitlejust; + theme->a_menu_text_title->texture[0].data.text.font = + theme->menu_title_font; + theme->a_menu_text_title->texture[0].data.text.color = + theme->menu_title_color; if (!FIND(shadow, L("menu","title","text","shadow","offset"), - theme->a_menu_title)) - theme->a_menu_title->texture[0].data.text.shadow_offset_x = - theme->a_menu_title->texture[0].data.text.shadow_offset_y = 0; - theme->a_menu_title->texture[0].data.text.shadow_color = + theme->a_menu_text_title)) + theme->a_menu_text_title->texture[0].data.text.shadow_offset_x = + theme->a_menu_text_title->texture[0].data.text.shadow_offset_y = 0; + theme->a_menu_text_title->texture[0].data.text.shadow_color = theme->menu_title_shadow_color; - theme->a_menu_title->texture[0].data.text.shadow_alpha = + theme->a_menu_text_title->texture[0].data.text.shadow_alpha = theme->menu_title_shadow_alpha; theme->a_menu_text_normal->texture[0].type = @@ -1117,7 +1121,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, MAX(theme->win_font_height, RrFontHeight(theme->win_font_unfocused, a->texture[0].data.text.shadow_offset_y)); - a = theme->a_menu_title; + a = theme->a_menu_text_title; theme->menu_title_font_height = RrFontHeight(theme->menu_title_font, a->texture[0].data.text.shadow_offset_y); @@ -1294,6 +1298,7 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->a_unfocused_handle); RrAppearanceFree(theme->a_menu); RrAppearanceFree(theme->a_menu_title); + RrAppearanceFree(theme->a_menu_text_title); RrAppearanceFree(theme->a_menu_normal); RrAppearanceFree(theme->a_menu_disabled); RrAppearanceFree(theme->a_menu_selected); |