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

fix a crash error which is caused by the focus of submenu(#65)

Browse Source
This commit is contained in:
Jinhao 2015-06-25 01:32:54 +08:00
parent d528b5c94d
commit e479689946
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/gui/widgets/menu.cpp
View File

@ -700,15 +700,18 @@ namespace nana
class menu_window class menu_window
: public widget_object<category::root_tag, menu_drawer> : public widget_object<category::root_tag, menu_drawer>
{ {
typedef menu_drawer drawer_type; using drawer_type = menu_drawer;
typedef widget_object<category::root_tag, menu_drawer> base_type; using base_type = widget_object<category::root_tag, menu_drawer>;
public: public:
typedef menu_builder::item_type item_type; using item_type = menu_builder::item_type;
menu_window(window wd, const point& pos, renderer_interface * rdptr)
menu_window(window wd, bool is_wd_parent_menu, const point& pos, renderer_interface * rdptr)
//add a is_wd_parent_menu to determine whether the menu wants the focus.
//if a submenu gets the focus, the program may cause a crash error when the submenu is being destroyed
: base_type(wd, false, rectangle(pos, nana::size(2, 2)), appear::bald<appear::floating>()), : base_type(wd, false, rectangle(pos, nana::size(2, 2)), appear::bald<appear::floating>()),
want_focus_(nullptr == wd || (API::focus_window() != wd)), want_focus_{ (!wd) || ((!is_wd_parent_menu) && (API::focus_window() != wd)) },
event_focus_(nullptr) event_focus_{ nullptr }
{ {
caption(STR("nana menu window")); caption(STR("nana menu window"));
get_drawer_trigger().close_menu_tree([this]{ this->_m_close_all(); }); get_drawer_trigger().close_menu_tree([this]{ this->_m_close_all(); });
@ -1012,7 +1015,7 @@ namespace nana
pos.x += sbm->gaps.x; pos.x += sbm->gaps.x;
pos.y += sbm->gaps.y; pos.y += sbm->gaps.y;
menu_window & mwnd = form_loader<menu_window, false>()(handle(), pos, mdtrigger.renderer); menu_window & mwnd = form_loader<menu_window, false>()(handle(), true, pos, mdtrigger.renderer);
mwnd.state_.self_submenu = true; mwnd.state_.self_submenu = true;
submenu_.child = & mwnd; submenu_.child = & mwnd;
submenu_.child->submenu_.parent = this; submenu_.child->submenu_.parent = this;
@ -1294,7 +1297,7 @@ namespace nana
{ {
close(); close();
impl_->uiobj = &(form_loader<drawerbase::menu::menu_window, false>()(wd, point(x, y), &(*impl_->mbuilder.renderer()))); impl_->uiobj = &(form_loader<drawerbase::menu::menu_window, false>()(wd, false, point(x, y), &(*impl_->mbuilder.renderer())));
impl_->uiobj->events().destroy.connect_unignorable([this]{ impl_->uiobj->events().destroy.connect_unignorable([this]{
impl_->uiobj = nullptr; impl_->uiobj = nullptr;
if (impl_->destroy_answer) if (impl_->destroy_answer)