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

fix bug that inline-widgets positioned wrong column

Browse Source
This commit is contained in:
Jinhao
2017-08-16 07:11:01 +08:00
parent 2cfc6ee8e6
commit 65b1ee1e95
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3661,6 +3661,7 @@ namespace nana
rectangle bground_r{ content_r.x + static_cast<int>(essence_->header.margin()), coord.y, show_w, essence_->item_height() }; rectangle bground_r{ content_r.x + static_cast<int>(essence_->header.margin()), coord.y, show_w, essence_->item_height() };
auto const state_bgcolor = this->_m_draw_item_bground(bground_r, bgcolor, {}, state, item); auto const state_bgcolor = this->_m_draw_item_bground(bground_r, bgcolor, {}, state, item);
//The position of column in x-axis.
int column_x = coord.x; int column_x = coord.x;
for (size_type display_order{ 0 }; display_order < seqs.size(); ++display_order) // get the cell (column) index in the order headers are displayed for (size_type display_order{ 0 }; display_order < seqs.size(); ++display_order) // get the cell (column) index in the order headers are displayed
@@ -3670,7 +3671,9 @@ namespace nana
if (col.width_px > essence_->scheme_ptr->text_margin) if (col.width_px > essence_->scheme_ptr->text_margin)
{ {
//The column text position, it is a offset to column_x.
int content_pos = 0; int content_pos = 0;
element_state estate = element_state::normal; element_state estate = element_state::normal;
nana::rectangle img_r; nana::rectangle img_r;
@@ -3721,7 +3724,7 @@ namespace nana
//Make sure the user-define inline widgets is in the right visible rectangle. //Make sure the user-define inline widgets is in the right visible rectangle.
rectangle pane_r; rectangle pane_r;
const auto wdg_x = coord.x + content_pos; const auto wdg_x = column_x + content_pos;
const auto wdg_w = col.width_px - static_cast<unsigned>(content_pos); const auto wdg_w = col.width_px - static_cast<unsigned>(content_pos);
bool visible_state = true; bool visible_state = true;