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

Merge branch 'hotfix-1.5.6' into develop

Browse Source
This commit is contained in:
Jinhao
2018-04-12 15:49:30 +08:00
parent 794367f8f6 9370f13a1b
commit 2cf374705f
10 changed files with 116 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,6 +316,11 @@ namespace nana
return cont_.back().index;
}
void clear()
{
cont_.clear();
}
unsigned width_px() const noexcept ///< the visible width of the whole header
{
unsigned pixels = 0;
@@ -1538,9 +1543,37 @@ namespace nana
return n;
}
template<typename Pred>
std::vector<std::pair<index_pair, bool>> select_display_range_if(const index_pair& fr_abs, index_pair to_dpl, bool deselect_others, Pred pred)
/// Finds a good item or category if an item specified by pos is invaild
index_pair find_next_good(index_pair pos, bool ignore_category) const noexcept
{
//Return the pos if it is good
if (this->good(pos))
return pos;
while(pos.cat < this->categories_.size())
{
if ((pos.npos == pos.item) && !ignore_category)
return pos;
auto cat_item_size = this->get(pos.cat)->items.size();
if (pos.item < cat_item_size)
return pos;
if ((pos.npos == pos.item) && (cat_item_size > 0) && ignore_category)
return index_pair{ pos.cat, 0 };
++pos.cat;
pos.item = pos.npos;
}
return index_pair{};
}
template<typename Pred>
std::vector<std::pair<index_pair, bool>> select_display_range_if(index_pair fr_abs, index_pair to_dpl, bool deselect_others, Pred pred)
{
fr_abs = find_next_good(fr_abs, true);
if (to_dpl.empty())
{
if (fr_abs.empty())
@@ -1548,6 +1581,7 @@ namespace nana
to_dpl = this->last();
}
auto fr_dpl = (fr_abs.is_category() ? fr_abs : this->index_cast(fr_abs, false)); //Converts an absolute position to display position
if (fr_dpl > to_dpl)
@@ -5467,6 +5501,15 @@ namespace nana
return pos;
}
void listbox::clear_headers()
{
internal_scope_guard lock;
auto & ess = _m_ess();
ess.lister.erase();
ess.header.clear();
ess.update();
}
listbox::cat_proxy listbox::append(std::string s)
{
internal_scope_guard lock;