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

Merge branch 'listbox_sortable' of https://github.com/beru/nana into beru-listbox_sortable

Browse Source
This commit is contained in:
Jinhao
2015-05-02 03:04:27 +08:00
parent e2992645db 77c039be42
commit a596516d51
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,6 +348,16 @@ namespace nana
return false;
}
bool sortable() const
{
return sortable_;
}
void sortable(bool enable)
{
sortable_ = enable;
}
std::function<bool(const nana::string&, nana::any*, const nana::string&, nana::any*, bool reverse)> fetch_comp(std::size_t index) const
{
if(index < cont_.size())
@@ -507,6 +517,7 @@ namespace nana
}
private:
bool visible_{true};
bool sortable_{true};
container cont_;
};
@@ -3183,7 +3194,7 @@ namespace nana
auto prev_state = essence_->ptr_state;
essence_->ptr_state = item_state::highlighted;
//Do sort
if (essence_->pointer_where.first == parts::header && prev_state == item_state::pressed)
if (essence_->header.sortable() && essence_->pointer_where.first == parts::header && prev_state == item_state::pressed)
{
if(essence_->pointer_where.second < essence_->header.cont().size())
{
@@ -4018,6 +4029,16 @@ namespace nana
return item_proxy(ess);
}
bool listbox::sortable() const
{
return _m_ess().header.sortable();
}
void listbox::sortable(bool enable)
{
_m_ess().header.sortable(enable);
}
void listbox::set_sort_compare(size_type col, std::function<bool(const nana::string&, nana::any*, const nana::string&, nana::any*, bool reverse)> strick_ordering)
{
_m_ess().header.column(col).weak_ordering = std::move(strick_ordering);