summaryrefslogtreecommitdiff
path: root/openbox/menu.h
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/menu.h')
-rw-r--r--openbox/menu.h13
1 files changed, 9 insertions, 4 deletions
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;
};