Merge branch 'backport' into work

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 9f51fabd905793c75a1fe61264348bb04871494a..9b2d663ed464ce9a57814e25591e660dffcb4d8f 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -45,7 +45,8 @@ struct _RrTheme {
     gint obwidth; /*!< osd border width */
     gint cbwidthx;
     gint cbwidthy;
-    gint menu_overlap;
+    gint menu_overlap_x;
+    gint menu_overlap_y;
     /* these ones are calculated, not set directly by the theme file */
     gint win_font_height;
     gint menu_title_font_height;
@@ -106,7 +107,9 @@ struct _RrTheme {
     gchar    menu_text_disabled_selected_shadow_alpha;
 
     /* style settings - pics */
-    RrPixel32 *def_win_icon; /* 48x48 RGBA */
+    RrPixel32 *def_win_icon; /* RGBA */
+    gint       def_win_icon_w;
+    gint       def_win_icon_h;
 
     /* style settings - masks */
     RrPixmapMask *max_mask;