dont ungrab twice when hiding menus
This commit is contained in:
parent
53134db127
commit
8a1e9c64d8
1 changed files with 3 additions and 2 deletions
|
@ -407,6 +407,7 @@ static void menu_frame_update(ObMenuFrame *self)
|
||||||
{
|
{
|
||||||
GList *mit, *fit;
|
GList *mit, *fit;
|
||||||
|
|
||||||
|
menu_pipe_execute(self->menu);
|
||||||
menu_find_submenus(self->menu);
|
menu_find_submenus(self->menu);
|
||||||
|
|
||||||
self->selected = NULL;
|
self->selected = NULL;
|
||||||
|
@ -480,8 +481,6 @@ void menu_frame_hide(ObMenuFrame *self)
|
||||||
if (!it)
|
if (!it)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
|
|
||||||
|
|
||||||
if (self->child)
|
if (self->child)
|
||||||
menu_frame_hide(self->child);
|
menu_frame_hide(self->child);
|
||||||
|
|
||||||
|
@ -495,6 +494,8 @@ void menu_frame_hide(ObMenuFrame *self)
|
||||||
grab_keyboard(FALSE);
|
grab_keyboard(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
|
||||||
|
|
||||||
XUnmapWindow(ob_display, self->window);
|
XUnmapWindow(ob_display, self->window);
|
||||||
|
|
||||||
menu_frame_free(self);
|
menu_frame_free(self);
|
||||||
|
|
Loading…
Reference in a new issue