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

fix a crash when the listbox inserts an item.

Browse Source
This commit is contained in:
Jinhao 2016-07-13 22:57:13 +08:00
parent 02acc4c216
commit 49dfaca1ef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -961,7 +961,7 @@ namespace nana
} }
/// Insert before item in absolute "pos" a new item with "text" in column 0, and place it in last display position of this cat /// Insert before item in absolute "pos" a new item with "text" in column 0, and place it in last display position of this cat
void insert(const index_pair& pos, std::string&& text) void insert(const index_pair& pos, std::string&& text, std::size_t columns)
{ {
auto & catobj = *get(pos.cat); auto & catobj = *get(pos.cat);
@ -990,8 +990,8 @@ namespace nana
container->emplace_back(); container->emplace_back();
} }
std::vector<cell> cells; std::vector<cell> cells{ columns };
cells.emplace_back(std::move(text)); cells[0] = std::move(text);
container->assign(item_index, cells); container->assign(item_index, cells);
} }
else else
@ -1000,9 +1000,9 @@ namespace nana
catobj.items.emplace(catobj.items.begin() + pos.item, std::move(text)); catobj.items.emplace(catobj.items.begin() + pos.item, std::move(text));
else else
catobj.items.emplace_back(std::move(text)); catobj.items.emplace_back(std::move(text));
}
catobj.items.back().cells->emplace_back(std::move(text)); catobj.items.back().cells->emplace_back(std::move(text));
}
} }
/// convert from display order to absolute (find the real item in that display pos) but without check from current active sorting, in fact using just the last sorting !!! /// convert from display order to absolute (find the real item in that display pos) but without check from current active sorting, in fact using just the last sorting !!!
@ -5246,7 +5246,7 @@ namespace nana
{ {
internal_scope_guard lock; internal_scope_guard lock;
auto & ess = _m_ess(); auto & ess = _m_ess();
ess.lister.insert(pos, std::move(text)); ess.lister.insert(pos, std::move(text), ess.header.cont().size());
if (!empty()) if (!empty())
{ {