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

Modify wxBoxSizer minimal size calculations to respect the proportions.

Browse Source 
Make wxBoxSizer minimal size big enough to not only give each item enough
space to satisfy its minimal size but also to respect the proportions among
the items by default.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-22 14:57:34 +00:00
parent b534aeb219
commit f27d62bf2f
2 changed files with 80 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/sizer.cpp
View File

@@ -2300,7 +2300,12 @@ wxSize wxBoxSizer::CalcMin()
m_totalProportion = 0;
m_minSize = wxSize(0, 0);
// calculate the minimal sizes for all items and count sum of proportions
// The minimal size for the sizer should be big enough to allocate its
// element at least its minimal size but also, and this is the non trivial
// part, to respect the children proportion. To satisfy the latter
// condition we must find the greatest min-size-to-proportion ratio for all
// elements with non-zero proportion.
float maxMinSizeToProp = 0.;
for ( wxSizerItemList::const_iterator i = m_children.begin();
i != m_children.end();
++i )
@@ -2311,13 +2316,31 @@ wxSize wxBoxSizer::CalcMin()
continue;
const wxSize sizeMinThis = item->CalcMin();
SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
if ( const int propThis = item->GetProportion() )
{
float minSizeToProp = GetSizeInMajorDir(sizeMinThis);
minSizeToProp /= propThis;
if ( minSizeToProp > maxMinSizeToProp )
maxMinSizeToProp = minSizeToProp;
m_totalProportion += item->GetProportion();
}
else // fixed size item
{
// Just account for its size directly
SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
}
// In the transversal direction we just need to find the maximum.
if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) )
SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis);
m_totalProportion += item->GetProportion();
}
// Using the max ratio ensures that the min size is big enough for all
// items to have their min size and satisfy the proportions among them.
SizeInMajorDir(m_minSize) += maxMinSizeToProp*m_totalProportion;
return m_minSize;
}