Kaydet (Commit) 497683ef authored tarafından Sébastien Le Ray's avatar Sébastien Le Ray Kaydeden (comit) Michael Meeks

Renamed shadow images to *-mask.

üst 4b8b1cc6
...@@ -31,9 +31,9 @@ ...@@ -31,9 +31,9 @@
#include "rcid.hrc" #include "rcid.hrc"
// Bitmaps for page shadow // Bitmaps for page shadow
#define BMP_PAGE_RIGHT_SHADOW RC_PAGEFRM_BEGIN + 0 #define BMP_PAGE_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 0
#define BMP_PAGE_BOTTOM_RIGHT_SHADOW RC_PAGEFRM_BEGIN + 1 #define BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK RC_PAGEFRM_BEGIN + 1
#define BMP_PAGE_BOTTOM_SHADOW RC_PAGEFRM_BEGIN + 2 #define BMP_PAGE_BOTTOM_SHADOW_MASK RC_PAGEFRM_BEGIN + 2
// If you add resources, don't forget to update this // If you add resources, don't forget to update this
......
#include "pagefrm.hrc" #include "pagefrm.hrc"
Bitmap BMP_PAGE_RIGHT_SHADOW Bitmap BMP_PAGE_RIGHT_SHADOW_MASK
{ {
File = "page-right-shadow.png"; File = "page-right-shadow-mask.png";
}; };
Bitmap BMP_PAGE_BOTTOM_RIGHT_SHADOW Bitmap BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK
{ {
File = "page-bottomright-shadow.png"; File = "page-bottomright-shadow-mask.png";
}; };
Bitmap BMP_PAGE_BOTTOM_SHADOW Bitmap BMP_PAGE_BOTTOM_SHADOW_MASK
{ {
File = "page-bottom-shadow.png"; File = "page-bottom-shadow-mask.png";
}; };
...@@ -5313,7 +5313,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; ...@@ -5313,7 +5313,7 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10;
if(!initialized) { if(!initialized) {
AlphaMask aMask( SW_RES( BMP_PAGE_BOTTOM_RIGHT_SHADOW ) ); AlphaMask aMask( SW_RES( BMP_PAGE_BOTTOM_RIGHT_SHADOW_MASK ) );
Bitmap aFilledSquare( Size( mnShadowPxWidth, mnShadowPxWidth ), 24 ); Bitmap aFilledSquare( Size( mnShadowPxWidth, mnShadowPxWidth ), 24 );
aFilledSquare.Erase( aShadowColor ); aFilledSquare.Erase( aShadowColor );
...@@ -5325,12 +5325,12 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10; ...@@ -5325,12 +5325,12 @@ const sal_Int8 SwPageFrm::mnShadowPxWidth = 10;
aFilledSquare = Bitmap( Size( 1, mnShadowPxWidth ), 24 ); aFilledSquare = Bitmap( Size( 1, mnShadowPxWidth ), 24 );
aFilledSquare.Erase( aShadowColor ); aFilledSquare.Erase( aShadowColor );
aMask = Bitmap( SW_RES( BMP_PAGE_BOTTOM_SHADOW ) ); aMask = Bitmap( SW_RES( BMP_PAGE_BOTTOM_SHADOW_MASK ) );
aPageBottomShadowBase = BitmapEx( aFilledSquare, aMask ); aPageBottomShadowBase = BitmapEx( aFilledSquare, aMask );
aFilledSquare = Bitmap( Size( mnShadowPxWidth, 1 ), 24 ); aFilledSquare = Bitmap( Size( mnShadowPxWidth, 1 ), 24 );
aFilledSquare.Erase( aShadowColor ); aFilledSquare.Erase( aShadowColor );
aMask = Bitmap( SW_RES( BMP_PAGE_RIGHT_SHADOW ) ); aMask = Bitmap( SW_RES( BMP_PAGE_RIGHT_SHADOW_MASK ) );
aPageRightShadowBase = BitmapEx( aFilledSquare, aMask ); aPageRightShadowBase = BitmapEx( aFilledSquare, aMask );
initialized = true; initialized = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment