From: Dana Jansens Date: Tue, 25 Jan 2011 17:02:42 +0000 (-0500) Subject: be a bit more explicit about what is being copied from one texture to another X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=2288da0ae3b44c987687e3deeb7864fcb7b23bb9;p=chaz%2Fopenbox be a bit more explicit about what is being copied from one texture to another --- diff --git a/obrender/theme.c b/obrender/theme.c index 6f93b0b8..9cc41573 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -1050,16 +1050,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 =