strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aquavcl06 (1.58.6); FILE MERGED

Browse source 
2008/04/01 18:33:26 pl 1.58.6.1: #i87705# work around missing layouting
This commit is contained in:
Kurt Zenker 2008-04-04 10:01:13 +00:00
parent c9968a447b
commit 872782b2dc
1 changed files with 62 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
vcl/source/control/button.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: button.cxx,v $
*
* $Revision: 1.58 $
* $Revision: 1.59 $
*
* last change: $Author: kz $ $Date: 2008-03-05 17:07:33 $
* last change: $Author: kz $ $Date: 2008-04-04 11:01:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -3296,6 +3296,36 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, USHORT nFlags )
// -----------------------------------------------------------------------
void RadioButton::ImplSetMinimumNWFSize()
{
Push( PUSH_MAPMODE );
SetMapMode( MAP_PIXEL );
ImplControlValue aControlValue;
Size aCurSize( GetSizePixel() );
Region aCtrlRegion = Region( Rectangle( Point( 0, 0 ), aCurSize ) );
Region aBoundingRgn, aContentRgn;
// get native size of a radiobutton
if( GetNativeControlRegion( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL, aCtrlRegion,
CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
aBoundingRgn, aContentRgn ) )
{
Rectangle aCont(aContentRgn.GetBoundRect());
Size aSize = aCont.GetSize();
if( aSize.Height() > aCurSize.Height() )
{
aCurSize.Height() = aSize.Height();
SetSizePixel( aCurSize );
}
}
Pop();
}
// -----------------------------------------------------------------------
Size RadioButton::CalcMinimumSize( long nMaxWidth ) const
{
Size aSize;
@ -4172,6 +4202,36 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, USHORT nFlags )
// -----------------------------------------------------------------------
void CheckBox::ImplSetMinimumNWFSize()
{
Push( PUSH_MAPMODE );
SetMapMode( MAP_PIXEL );
ImplControlValue aControlValue;
Size aCurSize( GetSizePixel() );
Region aCtrlRegion = Region( Rectangle( Point( 0, 0 ), aCurSize ) );
Region aBoundingRgn, aContentRgn;
// get native size of a radiobutton
if( GetNativeControlRegion( CTRL_CHECKBOX, PART_ENTIRE_CONTROL, aCtrlRegion,
CTRL_STATE_DEFAULT|CTRL_STATE_ENABLED, aControlValue, rtl::OUString(),
aBoundingRgn, aContentRgn ) )
{
Rectangle aCont(aContentRgn.GetBoundRect());
Size aSize = aCont.GetSize();
if( aSize.Height() > aCurSize.Height() )
{
aCurSize.Height() = aSize.Height();
SetSizePixel( aCurSize );
}
}
Pop();
}
// -----------------------------------------------------------------------
Size CheckBox::CalcMinimumSize( long nMaxWidth ) const
{
Size aSize = ImplGetCheckImageSize();