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

make listbox::index_pair constructor explicit

Browse Source
This commit is contained in:
Jinhao 2016-07-11 04:12:04 +08:00
parent 5340c4f670
commit 8489e16d72
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -633,7 +633,7 @@ namespace nana
size_type cat; //The pos of category size_type cat; //The pos of category
size_type item; //the pos of item in a category. size_type item; //the pos of item in a category.
index_pair(size_type cat_pos = 0, size_type item_pos = 0) explicit index_pair(size_type cat_pos = 0, size_type item_pos = 0)
: cat(cat_pos), : cat(cat_pos),
item(item_pos) item(item_pos)
{} {}
@ -1383,7 +1383,7 @@ the nana::detail::basic_window member pointer scheme
* @param abs_pos The absolute position before which an item will be inserted. * @param abs_pos The absolute position before which an item will be inserted.
* @param text Text of the first column. * @param text Text of the first column.
*/ */
void insert_item(const index_pair& abs_pos, ::std::wstring text); void insert_item(const index_pair& abs_pos, const ::std::wstring& text);
/// Returns an index of item which contains the specified point. /// Returns an index of item which contains the specified point.
index_pair cast(const point & pos) const; index_pair cast(const point & pos) const;

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

@ -1578,7 +1578,7 @@ namespace nana
} }
++id.cat; ++id.cat;
} }
return {npos,npos}; return index_pair{npos,npos};
} }
/// return absolute positions, no relative to display /// return absolute positions, no relative to display
@ -1867,7 +1867,7 @@ namespace nana
/// absolute position of the last displayed item /// absolute position of the last displayed item
index_pair last_displ() const index_pair last_displ() const
{ {
return absolute ( last() ); return index_pair{ absolute(last()) };
} }
/// can be used as the absolute position of the first absolute item, or as the display pos of the first displayed item /// can be used as the absolute position of the first absolute item, or as the display pos of the first displayed item
@ -1880,7 +1880,7 @@ namespace nana
/// absolute position of the first displayed item /// absolute position of the first displayed item
index_pair first_displ() const index_pair first_displ() const
{ {
return absolute ( first() ); return index_pair{ absolute(first()) };
} }
bool good(size_type cat) const bool good(size_type cat) const
@ -1938,7 +1938,7 @@ namespace nana
{ {
//Returns an empty pos if item pos npos //Returns an empty pos if item pos npos
auto item_pos = absolute(display_pos); auto item_pos = absolute(display_pos);
return {item_pos != npos ? display_pos.cat : npos, item_pos}; return index_pair{item_pos != npos ? display_pos.cat : npos, item_pos};
} }
///Translate absolute position (original data order) into relative position (position in display) ///Translate absolute position (original data order) into relative position (position in display)
@ -1962,7 +1962,7 @@ namespace nana
{ {
//Returns an empty pos if item is npos //Returns an empty pos if item is npos
auto item_pos = relative(pos); auto item_pos = relative(pos);
return {(item_pos != npos ? pos.cat : npos), item_pos}; return index_pair{(item_pos != npos ? pos.cat : npos), item_pos};
} }
/// all arg are relative to display order, or all are absolute, but not mixed /// all arg are relative to display order, or all are absolute, but not mixed
@ -2301,12 +2301,12 @@ namespace nana
const auto items = lister.the_number_of_expanded(); const auto items = lister.the_number_of_expanded();
const auto disp_items = number_of_lister_items(false); const auto disp_items = number_of_lister_items(false);
size_type off = lister.distance({ 0, 0 }, scroll.offset_y_dpl); size_type off = lister.distance(index_pair{ 0, 0 }, scroll.offset_y_dpl);
if (items < disp_items + off) if (items < disp_items + off)
{ {
index_pair pos; index_pair pos;
if (lister.forward({ 0, 0 }, items - disp_items, pos)) if (lister.forward(index_pair{ 0, 0 }, items - disp_items, pos))
{ {
off = items - disp_items; off = items - disp_items;
set_scroll_y_dpl(pos); set_scroll_y_dpl(pos);
@ -2406,7 +2406,7 @@ namespace nana
else if(!scroll.v.empty()) else if(!scroll.v.empty())
{ {
scroll.v.close(); scroll.v.close();
set_scroll_y_dpl({0,0}); set_scroll_y_dpl(index_pair{0,0});
} }
adjust_scroll_value(); adjust_scroll_value();
} }
@ -4206,7 +4206,7 @@ namespace nana
{ {
if(essence_->lister.sort_index(essence_->pointer_where.second)) if(essence_->lister.sort_index(essence_->pointer_where.second))
{ {
essence_->trace_item_dpl({0,0}); essence_->trace_item_dpl(index_pair{0,0});
refresh(graph); refresh(graph);
API::dev::lazy_refresh(); API::dev::lazy_refresh();
} }
@ -4780,8 +4780,7 @@ namespace nana
{ {
internal_scope_guard lock; internal_scope_guard lock;
ess_->lister.throw_if_immutable_model(pos_); ess_->lister.throw_if_immutable_model(index_pair{ pos_ });
cat_->sorted.push_back(cat_->items.size()); cat_->sorted.push_back(cat_->items.size());
@ -5233,7 +5232,7 @@ namespace nana
} }
} }
void listbox::insert_item(const index_pair& pos, std::wstring text) void listbox::insert_item(const index_pair& pos, const std::wstring& text)
{ {
insert_item(pos, to_utf8(text)); insert_item(pos, to_utf8(text));
} }