projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6c8278
)
set up the menu's parent and children stuff before rendering it
author
Dana Jansens
<danakj@orodu.net>
Sun, 25 Mar 2007 16:38:04 +0000
(16:38 +0000)
committer
Dana Jansens
<danakj@orodu.net>
Sun, 25 Mar 2007 16:38:04 +0000
(16:38 +0000)
openbox/menuframe.c
patch
|
blob
|
history
diff --git
a/openbox/menuframe.c
b/openbox/menuframe.c
index
f8c0b05
..
30c332c
100644
(file)
--- 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);