mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync the menubutton size request and draw calculations

Browse Source 
Change-Id: I122254532dfe8ecd9c3118622bf24b50f885a0f6
This commit is contained in:
Caolán McNamara
2013-05-24 12:02:01 +01:00
parent dbfafb5475
commit 4881ec4acc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vcl/source/control/button.cxx
View File

@@ -1678,11 +1678,14 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
aSize = Size( 16, 12 ); aSize = Size( 16, 12 );
else else
aSize = Size( 26, 24 ); aSize = Size( 26, 24 );
if( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
aSize.Width() += 4;
} }
else if ( IsImage() && ! (ImplGetButtonState() & BUTTON_DRAW_NOIMAGE) ) else if ( IsImage() && ! (ImplGetButtonState() & BUTTON_DRAW_NOIMAGE) )
aSize = GetModeImage().GetSizePixel(); aSize = GetModeImage().GetSizePixel();
if( mnDDStyle == PUSHBUTTON_DROPDOWN_MENUBUTTON )
{
long nSymbolSize = GetTextHeight() / 2 + 1;
aSize.Width() += 2*nSymbolSize;
}
if ( !PushButton::GetText().isEmpty() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) ) if ( !PushButton::GetText().isEmpty() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
{ {
sal_uLong nDrawFlags = 0; sal_uLong nDrawFlags = 0;