diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-05-30 07:04:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-05-30 07:04:01 +0000 |
| commit | d59425651e03ce947cd2a68db41b37062f13e70f (patch) | |
| tree | 102835b7c678d60930629909602f31d4dc939c54 /vcl/aqua/source/gdi/salnativewidgets.cxx | |
| parent | b4d98f6c0dfd41fb381cf85667c276bdf98ccf42 (diff) | |
INTEGRATION: CWS aquavcl07 (1.11.4); FILE MERGED
2008/04/28 16:18:50 pl 1.11.4.2: #i85513# better look for normal buttons
2008/04/28 15:28:16 pl 1.11.4.1: #i86431# improve bevel <-> pushbutton heuristic
Diffstat (limited to 'vcl/aqua/source/gdi/salnativewidgets.cxx')
| -rw-r--r-- | vcl/aqua/source/gdi/salnativewidgets.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index 287db8f5ab6d..00ecc4b2eb93 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salnativewidgets.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -606,7 +606,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType, { // [ FIXME] : instead of use a value, vcl can retrieve corect values on the fly (to be implemented) const int PB_Mini_Height = 15; - const int PB_Norm_Height = 20; + const int PB_Norm_Height = 21; HIThemeButtonDrawInfo aPushInfo; aPushInfo.version = 0; @@ -626,7 +626,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType, aPushInfo.kind = kThemePushButtonMini; nPaintHeight = PB_Mini_Height; } - else if( rc.size.height < (PB_Norm_Height + PB_Norm_Height/2) ) + else if( pPBVal->mbSingleLine || rc.size.height < (PB_Norm_Height + PB_Norm_Height/2) ) { aPushInfo.kind = kThemePushButtonNormal; nPaintHeight = PB_Norm_Height; |