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

fixed a listbox header display issue.

Browse Source
This commit is contained in:
cnjinhao 2015-02-03 01:50:32 +08:00
parent 60474150f5
commit 9627a05280
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2404,8 +2404,7 @@ namespace nana
void _m_draw(const Container& cont, const nana::rectangle& rect) void _m_draw(const Container& cont, const nana::rectangle& rect)
{ {
graph_reference graph = *(essence_->graph); graph_reference graph = *(essence_->graph);
int x = rect.x - essence_->scroll.offset_x;
unsigned height = rect.height - 1;
int txtop = (rect.height - essence_->text_height) / 2 + rect.y; int txtop = (rect.height - essence_->text_height) / 2 + rect.y;
auto txtcolor = essence_->lister.wd_ptr()->fgcolor(); auto txtcolor = essence_->lister.wd_ptr()->fgcolor();
@ -2415,7 +2414,9 @@ namespace nana
if(essence_->pointer_where.first == parts::header && (item_spliter_ == npos)) if(essence_->pointer_where.first == parts::header && (item_spliter_ == npos))
state = essence_->ptr_state; state = essence_->ptr_state;
int bottom_y = static_cast<int>(rect.y + rect.height - 2); const unsigned height = rect.height - 1;
const int bottom_y = rect.bottom() - 2;
int x = rect.x - essence_->scroll.offset_x;
for(auto & i: cont) for(auto & i: cont)
{ {
if(i.visible) if(i.visible)
@ -2427,15 +2428,14 @@ namespace nana
graph.line({ next_x - 1, rect.y }, { next_x - 1, bottom_y }, _m_border_color()); graph.line({ next_x - 1, rect.y }, { next_x - 1, bottom_y }, _m_border_color());
} }
if(next_x > rect.right())
break;
x = next_x; x = next_x;
if (x > rect.right())
break;
} }
} }
if(x - rect.x < static_cast<int>(rect.width)) if (x < rect.right())
graph.rectangle({ x, rect.y, rect.width - x + rect.x, height }, true, essence_->scheme_ptr->header_bgcolor); graph.rectangle({ x, rect.y, static_cast<unsigned>(rect.right() - x), height }, true, essence_->scheme_ptr->header_bgcolor);
} }
template<typename Item> template<typename Item>