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

treebox treats root paths / and \ as a node

Browse Source
This commit is contained in:
Jinhao 2018-12-12 00:21:06 +08:00
parent 3f446e9a0c
commit 5c50bd7a56
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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-2017 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2018 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
@ -479,6 +479,8 @@ namespace detail
return nullptr; return nullptr;
} }
// foreach elements of key.
// the root name "/" and "\\" are treated as a node. This is a feature that can easily support the UNIX-like path.
template<typename Function> template<typename Function>
void _m_for_each(const ::std::string& key, Function function) const void _m_for_each(const ::std::string& key, Function function) const
{ {
@ -491,18 +493,24 @@ namespace detail
{ {
if(beg != end) if(beg != end)
{ {
if(function(key.substr(beg, end - beg)) == false) if(!function(key.substr(beg, end - beg)))
return; return;
} }
auto next = key.find_first_not_of("\\/", end); auto next = key.find_first_not_of("\\/", end);
if(next != ::std::string::npos)
{ if ((next == ::std::string::npos) && end)
beg = next;
end = key.find_first_of("\\/", beg);
}
else
return; return;
if (0 == end)
{
if ((!function(key.substr(0, 1))) || (next == ::std::string::npos))
return;
}
beg = next;
end = key.find_first_of("\\/", beg);
} }
function(key.substr(beg, key.size() - beg)); function(key.substr(beg, key.size() - beg));