diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 10:55:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 10:55:12 +0000 |
| commit | 955bee78ba65afc631aa82732790c0cfc63766e6 (patch) | |
| tree | bdfa6889d58c10cb9f54eabe3162ecc55771faf9 | |
| parent | 7d009024b3a7ce288ef5595fbfb8976b5ca82cf5 (diff) | |
INTEGRATION: CWS c06 (1.89.80); FILE MERGED
2005/08/30 11:48:14 ssa 1.89.80.1: #i53937# make display of menu button optional
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 412eb523a826..c2ec38dede17 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbox.cxx,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: kz $ $Date: 2005-11-01 12:59:25 $ + * last change: $Author: rt $ $Date: 2005-11-11 11:55:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3216,6 +3216,10 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, BOOL bHighlight ) { if( !pThis->mpData->maMenubuttonItem.maRect.IsEmpty() ) { + // #i53937# paint menu button only if necessary + if( !(pThis->GetMenuType() & TOOLBOX_MENUTYPE_CUSTOMIZE) && !pThis->ImplHasClippedItems() ) + return; + // execute pending paint requests ImplCheckUpdate( pThis ); @@ -3286,14 +3290,8 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, BOOL bHighlight ) else aRect.Left() = aRect.Right() - aRect.getWidth()/3; - BOOL bSetColor = TRUE; - if( !(pThis->mpData->maMenuType & TOOLBOX_MENUTYPE_CUSTOMIZE) ) - { - // customization disabled - bSetColor = FALSE; - pThis->SetFillColor( pThis->GetSettings().GetStyleSettings().GetShadowColor() ); - } - ImplDrawDropdownArrow( pThis, aRect, bSetColor, !pThis->mbHorz ); + if( pThis->mpData->maMenuType & TOOLBOX_MENUTYPE_CUSTOMIZE ) + ImplDrawDropdownArrow( pThis, aRect, TRUE, !pThis->mbHorz ); if( pThis->ImplHasClippedItems() ) { |