openoffice-gui-toolbox.patch

   1 Index: vcl/source/window/toolbox.cxx
   2 ===================================================================
   3 RCS file: /cvs/gsl/vcl/source/window/toolbox.cxx,v
   4 retrieving revision 1.60
   5 diff -u -p -u -r1.60 toolbox.cxx
   6 --- vcl/source/window/toolbox.cxx       17 Apr 2003 15:19:46 -0000      1.60
   7 +++ vcl/source/window/toolbox.cxx       13 May 2003 12:16:02 -0000
   8 @@ -2795,27 +2795,29 @@ void ToolBox::ImplDrawItem( USHORT nPos,
   9              pTempItem = &mpData->m_aItems[nPos+1];
  10              if ( !pTempItem->mbShowWindow && !pTempItem->mbBreak )
  11              {
  12 -                long nCenterPos;
  13 +                long nCenterPos, nSlim;
  14                  SetLineColor( rStyleSettings.GetShadowColor() );
  15                  if ( IsHorizontal() )
  16                  {
  17 +                   nSlim = (pItem->maRect.Bottom() - pItem->maRect.Top ()) / 4;
  18                      nCenterPos = pItem->maRect.Center().X()-1;
  19 -                    DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
  20 -                              Point( nCenterPos, pItem->maRect.Bottom() ) );
  21 +                    DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim - 1),
  22 +                              Point( nCenterPos, pItem->maRect.Bottom() - nSlim - 1) );
  23                      nCenterPos++;
  24                      SetLineColor( rStyleSettings.GetLightColor() );
  25 -                    DrawLine( Point( nCenterPos, pItem->maRect.Top() ),
  26 -                              Point( nCenterPos, pItem->maRect.Bottom() ) );
  27 +                    DrawLine( Point( nCenterPos, pItem->maRect.Top() + nSlim),
  28 +                              Point( nCenterPos, pItem->maRect.Bottom() - nSlim) );
  29                  }
  30                  else
  31                  {
  32 +                   nSlim = (pItem->maRect.Right() - pItem->maRect.Left ()) / 4;
  33                      nCenterPos = pItem->maRect.Center().Y()-1;
  34 -                    DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
  35 -                              Point( pItem->maRect.Right(), nCenterPos ) );
  36 +                    DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos),
  37 +                              Point( pItem->maRect.Right() - nSlim, nCenterPos) );
  38                      nCenterPos++;
  39                      SetLineColor( rStyleSettings.GetLightColor() );
  40 -                    DrawLine( Point( pItem->maRect.Left(), nCenterPos ),
  41 -                              Point( pItem->maRect.Right(), nCenterPos ) );
  42 +                    DrawLine( Point( pItem->maRect.Left() + nSlim, nCenterPos ),
  43 +                              Point( pItem->maRect.Right() - nSlim, nCenterPos ) );
  44                  }
  45              }
  46          }
  47 @@ -3152,14 +3154,11 @@ void ToolBox::ImplDrawItem( USHORT nPos,
  48      {
  49
  50          Point aArrowPos( nOffX, nOffY );
  51 -        // shadows
  52 -        if( bHighlight == 2 )
  53 -        {
  54 -            aArrowPos.X() -= 2;
  55 -            aArrowPos.Y() -= 2;
  56 -        }
  57 +#define ARROW_SIZE_HIGHLIGHT 8
  58 +#define ARROW_SIZE_NO_HIGHLIGHT 6
  59
  60 -        aArrowPos.X() += nBtnWidth-6;
  61 +       int arrow_size = bHighlight ? ARROW_SIZE_HIGHLIGHT : ARROW_SIZE_NO_HIGHLIGHT;
  62 +        aArrowPos.X() += nBtnWidth - arrow_size;
  63
  64          Color       aOldLineColor = GetLineColor();
  65          Color       aOldFillColor = GetFillColor();
  66 @@ -3200,10 +3199,7 @@ void ToolBox::ImplDrawItem( USHORT nPos,
  67          if ( !pItem->mbEnabled || !IsEnabled() )
  68              SetFillColor( rStyleSettings.GetShadowColor() );
  69          else
  70 -        {
  71 -            SetFillColor( COL_LIGHTGREEN );
  72 -            bBlack = TRUE;
  73 -        }
  74 +            SetFillColor( rStyleSettings.GetMenuHighlightColor() );
  75
  76          SetClipRegion( aOldRegion );
  77