From 588aa0790abd0bf6452843c0e3490482e90b3654 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Fri, 16 Apr 2010 17:58:20 +0200
Subject: Allow setting icons for submenus

---
 openbox/menu.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'openbox/menu.h')

diff --git a/openbox/menu.h b/openbox/menu.h
index c0cc199d..76cc238f 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -103,6 +103,10 @@ typedef enum
 } ObMenuEntryType;
 
 struct _ObNormalMenuEntry {
+    /* Icon stuff.  If you set this, make sure you RrImageRef() it too. */
+    RrImage *icon;
+    gint     icon_alpha;
+
     gchar *label;
     /*! The shortcut key that would be used to activate this menu entry */
     gunichar shortcut;
@@ -117,10 +121,6 @@ struct _ObNormalMenuEntry {
     /* List of ObActions */
     GSList *actions;
 
-    /* Icon stuff.  If you set this, make sure you RrImageRef() it too. */
-    RrImage *icon;
-    gint     icon_alpha;
-
     /* Mask icon */
     RrPixmapMask *mask;
     RrColor *mask_normal_color;
@@ -132,8 +132,13 @@ struct _ObNormalMenuEntry {
 };
 
 struct _ObSubmenuMenuEntry {
+    /* Icon stuff.  If you set this, make sure you RrImageRef() it too. */
+    RrImage *icon;
+    gint     icon_alpha;
+
     gchar *name;
     ObMenu *submenu;
+    
     guint show_from;
 };
 
-- 
cgit v1.2.3