summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-28 15:21:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-28 15:24:13 +0100
commit741c430f6c7e289543f1f73ce6568e1f07a7ea48 (patch)
treea6f156338d317c9c91d8b804c58f56f90d953a64
parent76d1ca523ddcf89cc269fe51c70e66066943ef5a (diff)
Resolves: fdo#65924 retweak the border positions
required due to 45a8eaf9c55f2686f69118641d8a8992a86dfe31 Change-Id: Ibffc9b4a5eaa8ad538ce53f0389519721fdbcf20
-rw-r--r--icon-themes/galaxy/sw/res/page-shadow-mask.pngbin461 -> 527 bytes
-rw-r--r--sw/source/core/layout/paintfrm.cxx6
2 files changed, 3 insertions, 3 deletions
diff --git a/icon-themes/galaxy/sw/res/page-shadow-mask.png b/icon-themes/galaxy/sw/res/page-shadow-mask.png
index 1e5c32b75307..495afa0ad7b6 100644
--- a/icon-themes/galaxy/sw/res/page-shadow-mask.png
+++ b/icon-themes/galaxy/sw/res/page-shadow-mask.png
Binary files differ
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1797b88bb61f..55e1952a38a0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5988,9 +5988,9 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx&
// Right shadow & corners
if ( bPaintRightShadow )
{
- pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right() + 1, aPagePxRect.Bottom() + 1 - (aPageBottomRightShadow.GetSizePixel().Height() - mnShadowPxWidth) ) ),
+ pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right(), aPagePxRect.Bottom() + 1 - (aPageBottomRightShadow.GetSizePixel().Height() - mnShadowPxWidth) ) ),
aPageBottomRightShadow );
- pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right() + 1, aPagePxRect.Top() - mnShadowPxWidth ) ),
+ pOut->DrawBitmapEx( pOut->PixelToLogic( Point( aPaintRect.Right(), aPagePxRect.Top() - mnShadowPxWidth ) ),
aPageTopRightShadow );
if ( aPagePxRect.Height() > 2 * mnShadowPxWidth)
@@ -6021,7 +6021,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx&
BitmapEx aPageBottomShadow = aPageBottomShadowBase;
aPageBottomShadow.Scale( aPaintRect.Width(), 1 );
- lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 1 ),
+ lcl_paintBitmapExToRect( pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 2 ),
aPageBottomShadow, BOTTOM );
BitmapEx aPageTopShadow = aPageTopShadowBase;
aPageTopShadow.Scale( aPaintRect.Width(), 1 );