diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-11-21 16:56:07 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-11-21 16:56:07 -0500 |
| commit | 4bf6b1b551be744be4fbe4d1faab5be12d051378 (patch) | |
| tree | a17c1404021df31757bc53fe35914182f389c1e1 /render | |
| parent | c02c825cb8f18f0170b312ea8d4b3f4d491bff40 (diff) | |
| parent | ada5de28f71efaa5584709673cc49cdb3b703299 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/popup.c
Diffstat (limited to 'render')
| -rw-r--r-- | render/theme.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/render/theme.c b/render/theme.c index 8ead9673..399bd2c5 100644 --- a/render/theme.c +++ b/render/theme.c @@ -46,7 +46,8 @@ static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); -static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst) +static RrFont *get_font(RrFont *target, RrFont **default_font, + const RrInstance *inst) { if (target) { RrFontRef(target); @@ -147,8 +148,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ - theme->win_font_focused = get_font(active_window_font, &default_font, inst); - theme->win_font_unfocused = get_font(inactive_window_font, &default_font, inst); + theme->win_font_focused = get_font(active_window_font, + &default_font, inst); + theme->win_font_unfocused = get_font(inactive_window_font, + &default_font, inst); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.label.text.justify", &str)) { |