From c4b273a7fa57670a8ee85cea1e8dbcae3249c56e Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 2 Aug 2011 20:52:32 +0200 Subject: [PATCH] Revert "be a bit more explicit about what is being copied from one texture to another" This reverts commit 2288da0ae3b44c987687e3deeb7864fcb7b23bb9. --- obrender/theme.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/obrender/theme.c b/obrender/theme.c index 9cc41573..6f93b0b8 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -1050,21 +1050,16 @@ 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].type = - theme->osd_pressed_button->texture[0].type = - theme->osd_focused_button->texture[0].type = - RR_TEXTURE_TEXT; + 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].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 = -- 2.39.2