diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-09-25 12:50:46 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-09-28 13:35:42 +0200 |
commit | 76597aa62a09997beb794669008ce880327bda39 (patch) | |
tree | e2aee9db504a9ed472c31fae53724d23ca225f1d /vcl/source/outdev | |
parent | 15a5a56326761b79c9ea56b99a05faee457f1a1b (diff) |
rename for disentangling AA and B2D use in VCL drawing
This renames AntialiasingFlags::EnableB2dDraw to just Enable,
and the AntiAliasB2DDraw names to just AntiAlias. This is
in preparation for a second commit that will actually separate
the AA and B2D functionality of these flags.
Change-Id: I9cc215c5752dfabce41e00e19d9074fc8dc3d4de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103416
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/source/outdev')
-rw-r--r-- | vcl/source/outdev/line.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/outdevstate.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/polygon.cxx | 6 | ||||
-rw-r--r-- | vcl/source/outdev/polyline.cxx | 6 | ||||
-rw-r--r-- | vcl/source/outdev/transparent.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx index f451b6e1f645..6507c43408ed 100644 --- a/vcl/source/outdev/line.cxx +++ b/vcl/source/outdev/line.cxx @@ -108,7 +108,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) InitLineColor(); // #i101598# support AA and snap for lines, too - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) + if((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && IsLineColor()) @@ -151,7 +151,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt ) void OutputDevice::drawLine( basegfx::B2DPolyPolygon aLinePolyPolygon, const LineInfo& rInfo ) { - const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) + const bool bTryAA((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && IsLineColor()); diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 4ab3093b573b..7b1a22a9ce54 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -249,7 +249,7 @@ void OutputDevice::SetAntialiasing( AntialiasingFlags nMode ) if(mpGraphics) { - mpGraphics->setAntiAliasB2DDraw(bool(mnAntialiasing & AntialiasingFlags::EnableB2dDraw)); + mpGraphics->setAntiAlias(bool(mnAntialiasing & AntialiasingFlags::Enable)); } } diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx index e031fb05990c..996af41c0506 100644 --- a/vcl/source/outdev/polygon.cxx +++ b/vcl/source/outdev/polygon.cxx @@ -62,7 +62,7 @@ void OutputDevice::DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) InitFillColor(); // use b2dpolygon drawing if possible - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + if((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && (IsLineColor() || IsFillColor())) @@ -182,7 +182,7 @@ void OutputDevice::DrawPolygon( const tools::Polygon& rPoly ) InitFillColor(); // use b2dpolygon drawing if possible - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + if((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && (IsLineColor() || IsFillColor())) @@ -292,7 +292,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP bool bSuccess(false); - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + if((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && (IsLineColor() || IsFillColor())) diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx index 2a405e5eaf5a..e9b01f987f80 100644 --- a/vcl/source/outdev/polyline.cxx +++ b/vcl/source/outdev/polyline.cxx @@ -117,7 +117,7 @@ void OutputDevice::DrawPolyLine( const tools::Polygon& rPoly, const LineInfo& rL // #i101491# // Try direct Fallback to B2D-Version of DrawPolyLine - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + if((mnAntialiasing & AntialiasingFlags::Enable) && LineStyle::Solid == rLineInfo.GetStyle()) { DrawPolyLine( @@ -219,7 +219,7 @@ void OutputDevice::DrawPolyLine( const basegfx::B2DPolygon& rB2DPolygon, SetFillColor(aOldFillColor); InitFillColor(); - const bool bTryAA((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + const bool bTryAA((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && IsLineColor()); @@ -365,7 +365,7 @@ bool OutputDevice::DrawPolyLineDirectInternal( InitLineColor(); const bool bTryAA( bBypassAACheck || - ((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + ((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && RasterOp::OverPaint == GetRasterOp() && IsLineColor())); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 9c3783fa6512..e7864820b6ba 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -232,7 +232,7 @@ void OutputDevice::DrawTransparent( if( mbInitFillColor ) InitFillColor(); - if((mnAntialiasing & AntialiasingFlags::EnableB2dDraw) && + if((mnAntialiasing & AntialiasingFlags::Enable) && mpGraphics->supportsOperation(OutDevSupportType::B2DDraw) && (RasterOp::OverPaint == GetRasterOp()) ) { |