be a bit more explicit about what is being copied from one texture to another

[chaz/openbox] / obrender / theme.c

diff --git a/obrender/theme.c b/obrender/theme.c
index 6f93b0b865b3761939ff6be0f23bb5873353d8d5..9cc4157360cb67fec72a983c3409217fca483833 100644 (file)
--- 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 =