set up the menu's parent and children stuff before rendering it
This commit is contained in:
parent
e6c82786ff
commit
59c5d1cc4e
1 changed files with 3 additions and 2 deletions
|
@ -689,8 +689,6 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
|
||||||
|
|
||||||
if (menu_frame_is_visible(self))
|
if (menu_frame_is_visible(self))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
if (!menu_frame_show(self))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
self->monitor = parent->monitor;
|
self->monitor = parent->monitor;
|
||||||
self->parent = parent;
|
self->parent = parent;
|
||||||
|
@ -701,6 +699,9 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
|
||||||
menu_frame_hide(parent->child);
|
menu_frame_hide(parent->child);
|
||||||
parent->child = self;
|
parent->child = self;
|
||||||
|
|
||||||
|
if (!menu_frame_show(self))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
menu_frame_place_submenu(self);
|
menu_frame_place_submenu(self);
|
||||||
menu_frame_move_on_screen(self, &dx, &dy);
|
menu_frame_move_on_screen(self, &dx, &dy);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue