merge in r6153-6154 from the 3.4 branch

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 3359d04a8f6615978bd611aa1336d046f15e8928..8f66a383f8689d77a874b1dc89075e99b2a39f76 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -51,9 +51,10 @@ struct _RrTheme {
     gint menu_font_height;
     gint label_height;
     gint title_height;
-    gint menu_title_height;
     gint button_size;
     gint grip_width;
+    gint menu_title_label_height;
+    gint menu_title_height;
 
     /* style settings - colors */
     RrColor *menu_b_color;