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

Merge branch 'hotfix-1.6.2' into develop-1.7

Browse Source
This commit is contained in:
Jinhao 2018-12-07 06:58:11 +08:00
commit 648b460faa
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source/gui/widgets/treebox.cpp
View File

@ -1999,7 +1999,7 @@ namespace nana
}
else if (node_state.selected != node_state.pressed_node)
{
impl_->set_selected(node_state.pressed_node);
//impl_->set_selected(node_state.pressed_node); // todo: emit selected after checked
}
else
return;
@ -2022,27 +2022,23 @@ namespace nana
if(!nl.node())
return;
if (pressed_node == nl.node())
{
if ((impl_->node_state.selected != nl.node()) && nl.item_body())
{
impl_->set_selected(nl.node());
if (impl_->make_adjust(impl_->node_state.selected, 1))
impl_->adjust.scroll_timestamp = 1;
}
else if (nl.what() == component::crook)
{
checkstate cs = checkstate::unchecked;
if (checkstate::unchecked == nl.node()->value.second.checked)
cs = checkstate::checked;
if (pressed_node != nl.node())
return; //Do not refresh
check(nl.node(), cs);
}
else
return; //Do not refresh
if (nl.what() == component::crook)
{
checkstate cs = checkstate::unchecked;
if (checkstate::unchecked == nl.node()->value.second.checked)
cs = checkstate::checked;
check(nl.node(), cs);
}
if ((impl_->node_state.selected != nl.node()) && (nl.item_body() || nl.what() == component::crook))
{
impl_->set_selected(nl.node());
if (impl_->make_adjust(impl_->node_state.selected, 1))
impl_->adjust.scroll_timestamp = 1;
}
else
return; //Don't refresh
impl_->draw(true);
API::dev::lazy_refresh();