diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-04-26 13:10:36 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-04-26 13:10:36 +0000 |
| commit | 4e590eba236c587caff22d8cfc3a8fc0332cb206 (patch) | |
| tree | ab9c1fd825b694d9557d67b6a8504b71d58f4d21 /render/theme.c | |
| parent | 1c4c2b92a0be1b1358f34898ef47f74e0b21ae6a (diff) | |
add a separate font config for onscreendisplays
change menutitle in the rc to menuheader
fix up the xsd for fonts
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/render/theme.c b/render/theme.c index a80777ba..cb50887b 100644 --- a/render/theme.c +++ b/render/theme.c @@ -66,7 +66,8 @@ static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font) + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font) { ParseState ps; xmlNodePtr root; @@ -173,6 +174,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, } else theme->menu_font = RrFontOpenDefault(inst); + if (osd_font) { + theme->osd_font = osd_font; + RrFontRef(osd_font); + } else + theme->osd_font = RrFontOpenDefault(inst); + /* load direct dimensions */ if (!FIND(int, L("menu","overlap"), &theme->menu_overlap, -100, 100)) @@ -771,8 +778,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, theme->a_focused_label->texture[0].data.text.justify = winjust; theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = - theme->osd_hilite_label->texture[0].data.text.font = theme->win_font_focused; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; theme->a_focused_label->texture[0].data.text.color = theme->title_focused_color; theme->osd_hilite_label->texture[0].data.text.color = |