applied_patches/0462-calc-cursor-split-view.diff

   1 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
   2 index e842c7d..180cbc7 100644
   3 --- sc/source/ui/view/gridwin.cxx
   4 +++ sc/source/ui/view/gridwin.cxx
   5 @@ -5323,24 +5323,16 @@ void ScGridWindow::UpdateCursorOverlay()
   6              if ( bLayoutRTL )
   7                  aScrPos.X() -= nSizeXPix - 2;       // move instead of mirroring
   8
   9 -            BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
  10 -                            pViewData->GetVSplitMode() == SC_SPLIT_FIX );
  11 -            if ( pViewData->GetActivePart()==eWhich || bFix )
  12 -            {
  13 -                aScrPos.X() -= 2;
  14 -                aScrPos.Y() -= 2;
  15 -                Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
  16 -
  17 -                aPixelRects.push_back(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
  18 -                aPixelRects.push_back(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
  19 -                aPixelRects.push_back(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
  20 -                aPixelRects.push_back(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
  21 -            }
  22 -            else
  23 -            {
  24 -                Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) );
  25 -                aPixelRects.push_back( aRect );
  26 -            }
  27 +            // Now, draw the cursor.
  28 +
  29 +            aScrPos.X() -= 2;
  30 +            aScrPos.Y() -= 2;
  31 +            Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
  32 +
  33 +            aPixelRects.push_back(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
  34 +            aPixelRects.push_back(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
  35 +            aPixelRects.push_back(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
  36 +            aPixelRects.push_back(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
  37          }
  38      }
  39
  40 @@ -5362,7 +5354,10 @@ void ScGridWindow::UpdateCursorOverlay()
  41
  42          if(pOverlayManager)
  43          {
  44 -            const Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
  45 +            Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
  46 +            if (pViewData->GetActivePart() != eWhich)
  47 +                // non-active pane uses a different color.
  48 +                aCursorColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
  49              std::vector< basegfx::B2DRange > aRanges;
  50              const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
  51
  52 @@ -5513,7 +5509,10 @@ void ScGridWindow::UpdateAutoFillOverlay()
  53
  54          if(pOverlayManager)
  55          {
  56 -            const Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
  57 +            Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor );
  58 +            if (pViewData->GetActivePart() != eWhich)
  59 +                // non-active pane uses a different color.
  60 +                aHandleColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor;
  61              std::vector< basegfx::B2DRange > aRanges;
  62              const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
  63              basegfx::B2DRange aRB(aFillRect.Left(), aFillRect.Top(), aFillRect.Right() + 1, aFillRect.Bottom() + 1);