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

Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.5

Browse Source
This commit is contained in:
qPCR4vir
2017-10-10 14:39:31 +02:00
parent c982717012 b730f368a4
commit 2ccfda24d0
11 changed files with 223 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,8 +403,15 @@ namespace nana
ess_->state.nullify_mouse = true;
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)
{
menu_wd = menu_ptr->handle();
switch(arg.key)
{
case keyboard::os_arrow_down:
@@ -466,8 +473,11 @@ namespace nana
case keyboard::os_arrow_up:
case keyboard::os_arrow_down:
case keyboard::enter:
if(ess_->open_menu(true))
if (ess_->open_menu(true))
{
menu_wd = menu_ptr->handle();
menu_ptr->goto_next(true);
}
break;
case keyboard::escape:
if(essence::behavior::focus == ess_->state.behave)
@@ -481,15 +491,21 @@ namespace nana
if(index != npos)
{
ess_->state.active = index;
if(ess_->open_menu(true))
if (ess_->open_menu(true))
{
menu_wd = menu_ptr->handle();
menu_ptr->goto_next(true);
}
}
break;
}
}
refresh(graph);
API::dev::lazy_refresh();
if (API::is_window(menu_wd))
{
refresh(graph);
API::dev::lazy_refresh();
}
}
void trigger::key_release(graph_reference graph, const arg_keyboard& arg)

4
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -1233,7 +1233,7 @@ namespace nana{ namespace widgets
case keyboard::os_pagedown:
_m_handle_move_key(arg);
break;
case keyboard::os_del:
case keyboard::del:
// send delete to set_accept function
if (this->attr().editable && (!impl_->capacities.pred_acceptive || impl_->capacities.pred_acceptive(key)))
del();
@@ -1689,7 +1689,7 @@ namespace nana{ namespace widgets
impl_->try_refresh = sync_graph::refresh;
//_m_put calcs the lines
_m_reset_content_size(false);
_m_reset_content_size(true);
impl_->cview->sync(false);
}
}