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

hide treebox node expander if no visible children

Browse Source 
improve the new feature based on PR#500
This commit is contained in:
Jinhao 2020-01-28 23:29:10 +08:00
parent c7332129b0
commit 462aadcc26
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/gui/widgets/detail/tree_cont.hpp
View File

@ -1,6 +1,6 @@
/* /*
* A Tree Container class implementation * A Tree Container class implementation
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -508,7 +508,7 @@ namespace detail
void _m_for_each(const ::std::string& key, Function function) const void _m_for_each(const ::std::string& key, Function function) const
{ {
//Ignores separaters at the begin of key. //Ignores separaters at the begin of key.
::std::string::size_type beg = key.find_first_not_of("\\/"); auto beg = key.find_first_not_of("\\/");
if (key.npos == beg) if (key.npos == beg)
return; return;

4
include/nana/gui/widgets/treebox.hpp
View File

@ -1,7 +1,7 @@
/** /**
* A Tree Box Implementation * A Tree Box Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2020 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE or copy at * (See accompanying file LICENSE or copy at
@ -49,7 +49,7 @@ namespace nana
struct node_attribute struct node_attribute
{ {
bool has_children; bool has_children; ///< Determines whether the node has visible children
bool expended; bool expended;
checkstate checked; checkstate checked;
bool selected; bool selected;

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

@ -1,7 +1,7 @@
/* /*
* A Treebox Implementation * A Treebox Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2010 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -387,7 +387,18 @@ namespace nana
void assign_node_attr(node_attribute& ndattr, const node_type* node) const void assign_node_attr(node_attribute& ndattr, const node_type* node) const
{ {
ndattr.has_children = (nullptr != node->child); // Check if there is a visible child that node has.
// This is an improvement based on a new feature that allows treebox node to be hidden(PR#500)
ndattr.has_children = false;
for (auto p = node->child; p; p = p->next)
{
if (!p->value.second.hidden)
{
ndattr.has_children = true;
break;
}
}
ndattr.expended = node->value.second.expanded; ndattr.expended = node->value.second.expanded;
ndattr.text = node->value.second.text; ndattr.text = node->value.second.text;
ndattr.checked = node->value.second.checked; ndattr.checked = node->value.second.checked;
@ -1445,7 +1456,7 @@ namespace nana
switch(comp) switch(comp)
{ {
case component_t::expander: case component_t::expander:
if(attr.has_children) if (attr.has_children)
{ {
r->width = scheme_.item_offset; r->width = scheme_.item_offset;
return true; return true;