From 2539f1d142e0077dfeec36ef349a1f5443f1c94b Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Mon, 11 May 2020 08:45:19 +0200 Subject: tdf#132832 calcAdjustedSize: Take max width into account Actually take into account the preferred width when calculating the size of radio button, checkbox and hyperlink controls. This e.g. makes word wrap work properly when the multiline property is set for a checkbox, radio or hyperlink control and the single line text exceeds the preferred width, rather than keeping the whole text in one line that exceeds the preferred width. Change-Id: Id04668e4e1afe7c10a28468eff05cf04c10ae3c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93947 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- toolkit/source/awt/vclxwindows.cxx | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index d22474f0e362..97b7fa6677b5 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -940,7 +940,7 @@ css::awt::Size VCLXCheckBox::calcAdjustedSize( const css::awt::Size& rNewSize ) VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >(); if ( pCheckBox ) { - Size aMinSz = pCheckBox->CalcMinimumSize(); + Size aMinSz = pCheckBox->CalcMinimumSize(rNewSize.Width); if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) ) aSz.setHeight( aMinSz.Height() ); else @@ -1288,7 +1288,7 @@ css::awt::Size VCLXRadioButton::calcAdjustedSize( const css::awt::Size& rNewSize VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >(); if ( pRadioButton ) { - Size aMinSz = pRadioButton->CalcMinimumSize(); + Size aMinSz = pRadioButton->CalcMinimumSize(rNewSize.Width); if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) ) aSz.setHeight( aMinSz.Height() ); else @@ -3024,13 +3024,18 @@ css::awt::Size VCLXFixedHyperlink::getPreferredSize( ) css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& rNewSize ) { SolarMutexGuard aGuard; + Size aSz( VCLUnoHelper::ConvertToVCLSize( rNewSize )); + VclPtr< FixedText > pFixedText = GetAs< FixedText >(); + if (pFixedText) + { + Size aMinSz = pFixedText->CalcMinimumSize(rNewSize.Width); + if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < aMinSz.Height() ) ) + aSz.setHeight( aMinSz.Height() ); + else + aSz = aMinSz; + } - css::awt::Size aSz = rNewSize; - css::awt::Size aMinSz = getMinimumSize(); - if ( aSz.Height != aMinSz.Height ) - aSz.Height = aMinSz.Height; - - return aSz; + return VCLUnoHelper::ConvertToAWTSize(aSz); } void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const css::uno::Any& Value) -- cgit