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

code review of listbox

Browse Source
This commit is contained in:
Jinhao 2015-10-01 03:34:24 +08:00
parent 4cfe366758
commit 1ea2028233
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2668,12 +2668,10 @@ namespace nana
{ {
unsigned item_pixels = 0; unsigned item_pixels = 0;
auto item_x = essence_->header.item_pos(i, &item_pixels); auto item_x = essence_->header.item_pos(i, &item_pixels);
int midpos = item_x + static_cast<int>(item_pixels / 2);
//Get the item pos //Get the item pos
//if mouse pos is at left of an item middle, the pos of itself otherwise the pos of the next. //if mouse pos is at left of an item middle, the pos of itself otherwise the pos of the next.
place_front = (x <= midpos); place_front = (x <= (item_x + static_cast<int>(item_pixels / 2)));
x = (place_front ? item_x : essence_->header.item_pos(essence_->header.neighbor(i, false), nullptr)); x = (place_front ? item_x : essence_->header.item_pos(essence_->header.neighbor(i, false), nullptr));
if(i != npos) if(i != npos)
@ -2687,7 +2685,6 @@ namespace nana
template<typename Item> template<typename Item>
void _m_draw_header_item(graph_reference graph, int x, int y, unsigned height, int txtop, const ::nana::color& fgcolor, const Item& item, item_state state) void _m_draw_header_item(graph_reference graph, int x, int y, unsigned height, int txtop, const ::nana::color& fgcolor, const Item& item, item_state state)
{ {
essence_->scheme_ptr->header_bgcolor.get_color();
::nana::color bgcolor; ::nana::color bgcolor;
switch(state) switch(state)
{ {
@ -2866,8 +2863,9 @@ namespace nana
facade<element::arrow> arrow("double"); facade<element::arrow> arrow("double");
arrow.direction(categ.expand ? ::nana::direction::north : ::nana::direction::south); arrow.direction(categ.expand ? ::nana::direction::north : ::nana::direction::south);
::nana::rectangle arrow_r{ x + 5, y + static_cast<int>(essence_->item_size - 16) / 2, 16, 16 }; arrow.draw( *graph, {}, txt_color,
arrow.draw(*graph, {}, txt_color, arrow_r, element_state::normal); { x + 5, y + static_cast<int>(essence_->item_size - 16) / 2, 16, 16 },
element_state::normal);
graph->string({ x + 20, y + txtoff }, categ.text, txt_color); graph->string({ x + 20, y + txtoff }, categ.text, txt_color);
@ -3583,8 +3581,6 @@ namespace nana
{ {
if (ess) if (ess)
{ {
//auto i = ess_->lister.cat_container().begin();
//std::advance(i, pos.cat);
auto i = ess_->lister.get(pos.cat); auto i = ess_->lister.get(pos.cat);
cat_ = &(*i); // what is pos is a cat? cat_ = &(*i); // what is pos is a cat?
} }