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

small improvements

Browse Source
This commit is contained in:
Jinhao 2018-04-12 10:47:06 +08:00
parent 3de91cb9a2
commit 794367f8f6
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2048,7 +2048,6 @@ namespace nana
index_pair first_display() const noexcept index_pair first_display() const noexcept
{ {
auto offset_display = content_view->origin().y / item_height();
return lister.advance(lister.first(), static_cast<int>(content_view->origin().y / item_height())); return lister.advance(lister.first(), static_cast<int>(content_view->origin().y / item_height()));
} }
@ -2073,19 +2072,6 @@ namespace nana
return from + orignal.position() - origin; return from + orignal.position() - origin;
} }
struct pred_mouse_selection
{
index_pair pos_;
pred_mouse_selection(index_pair pos) noexcept
: pos_(pos)
{}
bool operator()(const std::pair<index_pair, bool>& m) const noexcept
{
return (pos_ == m.first);
}
};
std::pair<int, int> columns_range() const std::pair<int, int> columns_range() const
{ {
rectangle r; rectangle r;
@ -2179,9 +2165,12 @@ namespace nana
#endif #endif
{ {
if (selections.cend() == std::find_if(selections.cbegin(), selections.cend(), pred_mouse_selection{ *i })) auto & selpos = *i;
if (selections.cend() == std::find_if(selections.cbegin(), selections.cend(), /*pred_mouse_selection{ *i }*/[&selpos](const std::pair<index_pair, bool>& m){
return (selpos == m.first);
}))
{ {
item_proxy{ this, *i }.select(false); item_proxy{ this, selpos }.select(false);
i = mouse_selection.selections.erase(i); i = mouse_selection.selections.erase(i);
} }
else else