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

don't leave gaps around hidden columns/rows in wxFlexGridSizer (closes bug 1659872; part of patch 1667343) [backport from HEAD]

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-22 15:17:01 +00:00
parent b293119a93
commit 339a867854
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/sizer.cpp
View File

@@ -1474,6 +1474,8 @@ void wxFlexGridSizer::AdjustForFlexDirection()
// and now fill it with the largest value // and now fill it with the largest value
for ( n = 0; n < count; ++n ) for ( n = 0; n < count; ++n )
{ {
// don't touch hidden rows
if ( array[n] != -1 )
array[n] = largest; array[n] = largest;
} }
} }
@@ -1514,9 +1516,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
{ {
if (m_growableRows[idx] >= nrows ) if (m_growableRows[idx] >= nrows )
continue; continue;
if (m_rowHeights[ m_growableRows[idx] ] == -1) if (m_rowHeights[ m_growableRows[idx] ] != -1)
m_rowHeights[ m_growableRows[idx] ] = 0;
else
{ {
int delta = (sz.y - minsz.y); int delta = (sz.y - minsz.y);
if (sum_proportions == 0) if (sum_proportions == 0)
@@ -1566,9 +1566,7 @@ void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
{ {
if (m_growableCols[idx] >= ncols ) if (m_growableCols[idx] >= ncols )
continue; continue;
if (m_colWidths[ m_growableCols[idx] ] == -1) if (m_colWidths[ m_growableCols[idx] ] != -1)
m_colWidths[ m_growableCols[idx] ] = 0;
else
{ {
int delta = (sz.x - minsz.x); int delta = (sz.x - minsz.x);
if (sum_proportions == 0) if (sum_proportions == 0)