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

Merge branch 'hotfix-1.7' into develop

Browse Source
This commit is contained in:
Jinhao
2019-04-22 01:08:49 +08:00
parent ebb1cf79fb ac9cb8e589
commit a08e274088
7 changed files with 246 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/gui/widgets/listbox.cpp
View File

@@ -15,6 +15,7 @@
* Benjamin Navarro(pr#81)
* besh81(pr#130)
* dankan1890(pr#158)
* ErrorFlynn(pr#418)
*
*/
#include <algorithm>
@@ -5455,9 +5456,12 @@ namespace nana
internal_scope_guard lock;
if (_m_ess().lister.enable_ordered(enable))
{
_m_ess().update();
return true;
}
return true;
return false;
}
void listbox::auto_draw(bool enabled) noexcept

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

@@ -2371,6 +2371,19 @@ namespace nana
API::refresh_window(*this);
}
treebox::item_proxy treebox::hovered(bool exclude_expander) const
{
internal_scope_guard lock;
auto dw = &get_drawer_trigger();
if (dw->impl()->node_state.pointed)
{
//Returns empty item_proxy if the mouse is on expander and exclude_expander is required.
if (exclude_expander && (dw->impl()->node_state.comp_pointed == drawerbase::treebox::component::expander))
return item_proxy{};
}
return item_proxy(const_cast<drawer_trigger_t*>(dw), dw->impl()->node_state.pointed);
}
std::shared_ptr<scroll_operation_interface> treebox::_m_scroll_operation()
{
internal_scope_guard lock;