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

Fix calculating width of columns in the wxPG header.

Browse Source 
When calculating widths of columns in the header there is necessary to take into account also width of the vertical scrollbar in the grid, if it exists. When scrollbar is ignored in calculations then we get wrong width of internal border and in result the columns of the header don't match the columns of the grid (this issue can be observed in the propgrid sample).
This commit is contained in:
Artur Wieczorek
2015-06-01 20:19:11 +02:00
parent 2d5beca260
commit 85a76d2d61
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/propgrid/manager.cpp
View File

@@ -293,8 +293,15 @@ private:
void DetermineAllColumnWidths() const
{
const unsigned int colCount = m_page->GetColumnCount();
wxPropertyGrid* pg = m_manager->GetGrid();
int sbWidth = pg->HasScrollbar(wxSB_VERTICAL)
? wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, pg)
: 0;
// Internal border width
int borderWidth = (pg->GetSize().x - pg->GetClientSize().x - sbWidth) / 2;
const unsigned int colCount = m_page->GetColumnCount();
for ( unsigned int i = 0; i < colCount; i++ )
{
wxHeaderColumnSimple* colInfo = m_columns[i];
@@ -303,15 +310,21 @@ private:
int colMinWidth = m_page->GetColumnMinWidth(i);
if ( i == 0 )
{
wxPropertyGrid* pg = m_manager->GetGrid();
int margin = pg->GetMarginWidth();
// Compensate for the internal border
margin += (pg->GetSize().x - pg->GetClientSize().x) / 2;
int margin = pg->GetMarginWidth() + borderWidth;
colWidth += margin;
colMinWidth += margin;
}
else if ( i == colCount-1 )
{
// Compensate for the internal border and scrollbar
int margin = pg->GetMarginWidth() + borderWidth + sbWidth;
colWidth += margin;
colMinWidth += margin;
}
colInfo->SetWidth(colWidth);
colInfo->SetMinWidth(colMinWidth);
}
@@ -321,8 +334,14 @@ private:
{
wxPropertyGrid* pg = m_manager->GetGrid();
int sbWidth = pg->HasScrollbar(wxSB_VERTICAL)
? wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, pg)
: 0;
// Internal border width
int borderWidth = (pg->GetSize().x - pg->GetClientSize().x - sbWidth) / 2;
// Compensate for the internal border
int x = -((pg->GetSize().x - pg->GetClientSize().x) / 2);
int x = -borderWidth;
for ( int i=0; i<col; i++ )
x += m_columns[i]->GetWidth();