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

Patch [ 1100272 ] wxFlexGridSizer works wrong when some rows/cols are hidden

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-01-11 19:01:22 +00:00
parent 888c4e8f0d
commit 53701799b4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/sizer.cpp
View File

@@ -1131,9 +1131,11 @@ void wxFlexGridSizer::RecalcSizes()
SetItemBounds( node->GetData(), x, y, w, h); SetItemBounds( node->GetData(), x, y, w, h);
} }
y = y + m_rowHeights[r] + m_vgap; if (m_rowHeights[r] != -1)
y = y + m_rowHeights[r] + m_vgap;
} }
x = x + m_colWidths[c] + m_hgap; if (m_colWidths[c] != -1)
x = x + m_colWidths[c] + m_hgap;
} }
} }
@@ -1187,12 +1189,16 @@ wxSize wxFlexGridSizer::CalcMin()
int width = 0; int width = 0;
for (int col = 0; col < ncols; col++) for (int col = 0; col < ncols; col++)
if ( m_colWidths[ col ] != -1 ) if ( m_colWidths[ col ] != -1 )
width += m_colWidths[ col ] + ( col == ncols-1 ? 0 : m_hgap ); width += m_colWidths[ col ] + m_hgap;
if (width > 0)
width -= m_hgap;
int height = 0; int height = 0;
for (int row = 0; row < nrows; row++) for (int row = 0; row < nrows; row++)
if ( m_rowHeights[ row ] != -1 ) if ( m_rowHeights[ row ] != -1 )
height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap ); height += m_rowHeights[ row ] + m_vgap;
if (height > 0)
height -= m_vgap;
m_calculatedMinSize = wxSize( width, height ); m_calculatedMinSize = wxSize( width, height );
return m_calculatedMinSize; return m_calculatedMinSize;