include/vcl/outdev.hxx | 59 +++++++++++++----------------------------
vcl/source/outdev/bitmap.cxx | 8 +++++
vcl/source/outdev/bitmapex.cxx | 18 ++++++++++++
vcl/source/outdev/mask.cxx | 10 ++++++
4 files changed, 56 insertions(+), 39 deletions(-)
New commits:
commit 52a07baebf7d1bfeda7a74dd0eac22b9e349fb56
Author: Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Sun Sep 26 12:07:51 2021 +1000
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Sep 30 10:01:19 2021 +0200
vcl: remove MetaActionType param from DrawBitmap/DrawBitmapEx/DrawMask
This is needed to allow for a clean abstract class DrawingInterface,
which I will introduce in a followup patch.
Change-Id: I1bb631872e44a82094dcfff07c0f418e9a4a0224
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122614
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 87a69647d2ba..286a64b48bda 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1253,77 +1253,54 @@ public:
///@{
public:
-
- /** @overload
- void DrawBitmap(
- const Point& rDestPt,
- const Size& rDestSize,
- const Point& rSrcPtPixel,
- const Size& rSecSizePixel,
- const Bitmap& rBitmap,
- MetaActionType nAction = MetaActionType::BMPSCALEPART)
- */
void DrawBitmap(
const Point& rDestPt,
const Bitmap& rBitmap );
- /** @overload
- void DrawBitmap(
- const Point& rDestPt,
- const Size& rDestSize,
- const Point& rSrcPtPixel,
- const Size& rSecSizePixel,
- const Bitmap& rBitmap,
- MetaActionType nAction = MetaActionType::BMPSCALEPART)
- */
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Bitmap& rBitmap );
+ void DrawBitmap(
+ const Point& rDestPt,
+ const Size& rDestSize,
+ const Point& rSrcPtPixel,
+ const Size& rSrcSizePixel,
+ const Bitmap& rBitmap);
+
void DrawBitmap(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const Bitmap& rBitmap,
- MetaActionType nAction =
MetaActionType::BMPSCALEPART );
+ MetaActionType nAction );
- /** @overload
- void DrawBitmapEx(
- const Point& rDestPt,
- const Size& rDestSize,
- const Point& rSrcPtPixel,
- const Size& rSecSizePixel,
- const BitmapEx& rBitmapEx,
- MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
- */
void DrawBitmapEx(
const Point& rDestPt,
const BitmapEx& rBitmapEx );
- /** @overload
- void DrawBitmapEx(
- const Point& rDestPt,
- const Size& rDestSize,
- const Point& rSrcPtPixel,
- const Size& rSecSizePixel,
- const BitmapEx& rBitmapEx,
- MetaActionType nAction = MetaActionType::BMPEXSCALEPART)
- */
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const BitmapEx& rBitmapEx );
+ void DrawBitmapEx(
+ const Point& rDestPt,
+ const Size& rDestSize,
+ const Point& rSrcPtPixel,
+ const Size& rSrcSizePixel,
+ const BitmapEx& rBitmapEx);
+
void DrawBitmapEx(
const Point& rDestPt,
const Size& rDestSize,
const Point& rSrcPtPixel,
const Size& rSrcSizePixel,
const BitmapEx& rBitmapEx,
- MetaActionType nAction =
MetaActionType::BMPEXSCALEPART );
+ MetaActionType nAction );
/** @overload
virtual void DrawImage(
@@ -1522,6 +1499,10 @@ public:
void DrawMask( const Point& rDestPt, const Size&
rDestSize,
const Bitmap& rBitmap, const Color&
rMaskColor );
+ void DrawMask( const Point& rDestPt, const Size&
rDestSize,
+ const Point& rSrcPtPixel, const
Size& rSrcSizePixel,
+ const Bitmap& rBitmap, const Color&
rMaskColor);
+
void DrawMask( const Point& rDestPt, const Size&
rDestSize,
const Point& rSrcPtPixel, const
Size& rSrcSizePixel,
const Bitmap& rBitmap, const Color&
rMaskColor,
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 2cabf1898dea..478c9d04d1f6 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -49,6 +49,14 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const
Size& rDestSize, cons
DrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap,
MetaActionType::BMPSCALE );
}
+void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
+ const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
+ const Bitmap& rBitmap)
+{
+ assert(!is_double_buffered_window());
+
+ DrawBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap,
MetaActionType::BMPSCALEPART );
+}
void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx
index a8afded98b0c..cfa0512e9e4b 100644
--- a/vcl/source/outdev/bitmapex.cxx
+++ b/vcl/source/outdev/bitmapex.cxx
@@ -67,6 +67,24 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const
Size& rDestSize,
}
}
+void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
+ const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
+ const BitmapEx& rBitmapEx)
+{
+ assert(!is_double_buffered_window());
+
+ if( ImplIsRecordLayout() )
+ return;
+
+ if ( !rBitmapEx.IsAlpha() )
+ {
+ DrawBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel,
rBitmapEx.GetBitmap() );
+ }
+ else
+ {
+ DrawBitmapEx( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel,
rBitmapEx, MetaActionType::BMPEXSCALEPART );
+ }
+}
void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index 77e59f02ec0d..c1c3e3b018f5 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -44,6 +44,16 @@ void OutputDevice::DrawMask( const Point& rDestPt, const
Size& rDestSize,
DrawMask( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap,
rMaskColor, MetaActionType::MASKSCALE );
}
+void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
+ const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
+ const Bitmap& rBitmap, const Color& rMaskColor)
+{
+
+ assert(!is_double_buffered_window());
+
+ DrawMask( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, rBitmap,
rMaskColor, MetaActionType::MASKSCALEPART );
+}
+
void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
const Point& rSrcPtPixel, const Size&
rSrcSizePixel,
const Bitmap& rBitmap, const Color& rMaskColor,
