From: Dana Jansens <danakj@orodu.net>
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-Tag: mikabox-3.5-7~122
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=ef0bfdc743dfaf783e8d6f776e8391b8546f9598

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 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 =