Merge branch 'backport' into work

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 3f87ce93282a3a0d7f4dd36e566a17ae9bc38814..9b2d663ed464ce9a57814e25591e660dffcb4d8f 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -107,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;
@@ -145,6 +147,9 @@ struct _RrTheme {
     RrPixmapMask *menu_toggle_mask; /* menu boolean */
 #endif
 
+    RrPixmapMask *down_arrow_mask;
+    RrPixmapMask *up_arrow_mask;
+
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
     RrAppearance *a_disabled_unfocused_max;