summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-03-25 16:38:04 +0000
committerDana Jansens <danakj@orodu.net>2007-03-25 16:38:04 +0000
commit59c5d1cc4e9d149510c62af16354ebd172452f48 (patch)
tree11281bf8204c68602c58d0e6064bca370f39b9c4
parente6c82786ff65e7681c980c8adebe082656c16438 (diff)
set up the menu's parent and children stuff before rendering it
-rw-r--r--openbox/menuframe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index f8c0b055..30c332ce 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -689,8 +689,6 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
if (menu_frame_is_visible(self))
return TRUE;
- if (!menu_frame_show(self))
- return FALSE;
self->monitor = parent->monitor;
self->parent = parent;
@@ -701,6 +699,9 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
menu_frame_hide(parent->child);
parent->child = self;
+ if (!menu_frame_show(self))
+ return FALSE;
+
menu_frame_place_submenu(self);
menu_frame_move_on_screen(self, &dx, &dy);