Added GetAdjustedBestSize which returns the largest of
BestSize and any user specified Min size hints. Put it to use with wxADJUST_MINSIZE, which now has a chance of working; a) if the item gets smaller, and b) with controls (like wxButton) for whom BestSize and the user MinSize share only the most tenuous relationship. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -148,14 +148,11 @@ wxSize wxSizerItem::CalcMin()
|
||||
{
|
||||
if ( IsWindow() && (m_flag & wxADJUST_MINSIZE) )
|
||||
{
|
||||
// check if the best (minimal, in fact) window size hadn't changed
|
||||
// by chance: this may happen for, e.g. static text if its label
|
||||
// changed
|
||||
wxSize size = m_window->GetBestSize();
|
||||
if ( size.x > m_minSize.x )
|
||||
m_minSize.x = size.x;
|
||||
if ( size.y > m_minSize.y )
|
||||
m_minSize.y = size.y;
|
||||
// By user request, keep the minimal size for this item
|
||||
// in sync with the largest of BestSize and any user supplied
|
||||
// minimum size hint. Useful in cases where the item is
|
||||
// changeable -- static text labels, etc.
|
||||
m_minSize = m_window->GetAdjustedBestSize();
|
||||
}
|
||||
|
||||
ret = m_minSize;
|
||||
|
Reference in New Issue
Block a user