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

Don't use hidden items for size calc (patch 1698314)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-11 21:53:13 +00:00
parent 70cab5b769
commit af579c91c2
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/gbsizer.cpp
View File

@@ -537,20 +537,24 @@ void wxGridBagSizer::RecalcSizes()
{ {
int row, col, endrow, endcol; int row, col, endrow, endcol;
wxGBSizerItem* item = (wxGBSizerItem*)node->GetData(); wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
item->GetPos(row, col);
item->GetEndPos(endrow, endcol);
height = 0; if ( item->IsShown() )
for(idx=row; idx <= endrow; idx++) {
height += m_rowHeights[idx]; item->GetPos(row, col);
height += (endrow - row) * m_vgap; // add a vgap for every row spanned item->GetEndPos(endrow, endcol);
width = 0; height = 0;
for (idx=col; idx <= endcol; idx++) for(idx=row; idx <= endrow; idx++)
width += m_colWidths[idx]; height += m_rowHeights[idx];
width += (endcol - col) * m_hgap; // add a hgap for every col spanned height += (endrow - row) * m_vgap; // add a vgap for every row spanned
SetItemBounds(item, colpos[col], rowpos[row], width, height); width = 0;
for (idx=col; idx <= endcol; idx++)
width += m_colWidths[idx];
width += (endcol - col) * m_hgap; // add a hgap for every col spanned
SetItemBounds(item, colpos[col], rowpos[row], width, height);
}
node = node->GetNext(); node = node->GetNext();
} }