From ef0bfdc743dfaf783e8d6f776e8391b8546f9598 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 25 Jan 2011 12:02:42 -0500 Subject: [PATCH] be a bit more explicit about what is being copied from one texture to another --- obrender/theme.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/obrender/theme.c b/obrender/theme.c index ea49abe..85cdf4a 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -1001,16 +1001,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_hilite_label->texture[0].data.text.shadow_alpha = theme->osd_text_active_shadow_alpha; - theme->osd_unpressed_button->texture[0] = - theme->osd_pressed_button->texture[0] = - theme->osd_focused_button->texture[0] = - theme->osd_hilite_label->texture[0]; + theme->osd_unpressed_button->texture[0].type = + theme->osd_pressed_button->texture[0].type = + theme->osd_focused_button->texture[0].type = + RR_TEXTURE_TEXT; theme->osd_unpressed_button->texture[0].data.text.justify = theme->osd_pressed_button->texture[0].data.text.justify = theme->osd_focused_button->texture[0].data.text.justify = RR_JUSTIFY_CENTER; + theme->osd_unpressed_button->texture[0].data.text.font = + theme->osd_pressed_button->texture[0].data.text.font = + theme->osd_focused_button->texture[0].data.text.font = + theme->osd_font_hilite; + theme->osd_unpressed_button->texture[0].data.text.color = theme->osd_unpressed_color; theme->osd_pressed_button->texture[0].data.text.color = -- 1.9.1