mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix crash where a menubar popups a menu and exits by shortcut(#261)

Browse Source
This commit is contained in:
Jinhao 2017-09-23 07:33:31 +08:00
parent eec7344c6d
commit 13761be5e9
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/gui/widgets/menubar.cpp
View File

@ -403,8 +403,15 @@ namespace nana
ess_->state.nullify_mouse = true; ess_->state.nullify_mouse = true;
auto & menu_ptr = ess_->state.menu; auto & menu_ptr = ess_->state.menu;
//menu_wd will be assigned with the handle of a menu window,
//It is used for checking whether the menu is closed. A menu handler
//may close the form, checking with the data member of this trigger
//is invalid, because the form is closed, the object of menubar may not exist.
window menu_wd = nullptr;
if(ess_->state.menu) if(ess_->state.menu)
{ {
menu_wd = menu_ptr->handle();
switch(arg.key) switch(arg.key)
{ {
case keyboard::os_arrow_down: case keyboard::os_arrow_down:
@ -466,8 +473,11 @@ namespace nana
case keyboard::os_arrow_up: case keyboard::os_arrow_up:
case keyboard::os_arrow_down: case keyboard::os_arrow_down:
case keyboard::enter: case keyboard::enter:
if(ess_->open_menu(true)) if (ess_->open_menu(true))
{
menu_wd = menu_ptr->handle();
menu_ptr->goto_next(true); menu_ptr->goto_next(true);
}
break; break;
case keyboard::escape: case keyboard::escape:
if(essence::behavior::focus == ess_->state.behave) if(essence::behavior::focus == ess_->state.behave)
@ -481,16 +491,22 @@ namespace nana
if(index != npos) if(index != npos)
{ {
ess_->state.active = index; ess_->state.active = index;
if(ess_->open_menu(true)) if (ess_->open_menu(true))
{
menu_wd = menu_ptr->handle();
menu_ptr->goto_next(true); menu_ptr->goto_next(true);
} }
}
break; break;
} }
} }
if (API::is_window(menu_wd))
{
refresh(graph); refresh(graph);
API::dev::lazy_refresh(); API::dev::lazy_refresh();
} }
}
void trigger::key_release(graph_reference graph, const arg_keyboard& arg) void trigger::key_release(graph_reference graph, const arg_keyboard& arg)
{ {