backport the shrinking embedded controls fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -606,6 +606,7 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
|
||||
|
||||
item = (ControlToolbarItem*) malloc(sizeof(ControlToolbarItem)) ;
|
||||
item->toolbarItem = toolbarItem ;
|
||||
item->lastValidSize = wxSize(-1,-1);
|
||||
item->viewRef = NULL ;
|
||||
|
||||
SetEventParameter( inEvent, kEventParamHIObjectInstance, typeVoidPtr, sizeof( void * ), &item );
|
||||
@@ -680,16 +681,21 @@ static pascal OSStatus ControlToolbarItemHandler( EventHandlerCallRef inCallRef,
|
||||
wxWindow* wxwindow = wxFindControlFromMacControl(object->viewRef ) ;
|
||||
if ( wxwindow )
|
||||
{
|
||||
wxSize sz = wxwindow->GetSize() ;
|
||||
sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
|
||||
sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
|
||||
// during toolbar layout the native window sometimes gets negative sizes
|
||||
// so we always keep the last valid size here, to make sure we survive the
|
||||
// shuffle ...
|
||||
if ( sz.x > 0 && sz.y > 0 )
|
||||
object->lastValidSize = sz ;
|
||||
else
|
||||
sz = object->lastValidSize ;
|
||||
// during toolbar layout the native window sometimes gets negative sizes,
|
||||
// sometimes it just gets shrunk behind our back, so in order to avoid
|
||||
// ever shrinking more, once a valid size is captured, we keep it
|
||||
|
||||
wxSize sz = object->lastValidSize;
|
||||
if ( sz.x <= 0 || sz.y <= 0 )
|
||||
{
|
||||
sz = wxwindow->GetSize() ;
|
||||
sz.x -= wxwindow->MacGetLeftBorderSize() + wxwindow->MacGetRightBorderSize();
|
||||
sz.y -= wxwindow->MacGetTopBorderSize() + wxwindow->MacGetBottomBorderSize();
|
||||
if ( sz.x > 0 && sz.y > 0 )
|
||||
object->lastValidSize = sz ;
|
||||
else
|
||||
sz = wxSize(0,0) ;
|
||||
}
|
||||
|
||||
HISize min, max;
|
||||
min.width = max.width = sz.x ;
|
||||
|
Reference in New Issue
Block a user