cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly reorganize last column width calculation

Browse Source 
No real changes, just make it more obvious that we increase the last
column width to the remaining margin if it's smaller than it.
This commit is contained in:
Vadim Zeitlin 2020-01-31 16:18:41 +01:00
parent 01d0deb5bf
commit 1014877302
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/listctrl.cpp
View File

@ -3305,17 +3305,19 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
calculator.UpdateWithWidth(pWidthInfo->nMaxWidth);
}
width = calculator.GetMaxWidth() + AUTOSIZE_COL_MARGIN;
// expand the last column to fit the client size
// only for AUTOSIZE_USEHEADER to mimic MSW behaviour
int margin = 0;
if ( (width == wxLIST_AUTOSIZE_USEHEADER) && (col == GetColumnCount() - 1) )
{
margin = GetClientSize().GetX();
int margin = GetClientSize().GetX();
for ( int i = 0; i < col && margin > 0; ++i )
margin -= m_columns.Item(i)->GetData()->GetWidth();
}
width = wxMax(margin, calculator.GetMaxWidth() + AUTOSIZE_COL_MARGIN);
if ( margin > width )
width = margin;
}
}
column->SetWidth( width );