mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added handling of transparence to BackgroundColorPrimitive2D

Browse Source 
...which was missing in ::create2DDecomposition.

Change-Id: I585aa884e4d19bf6f34783d254f502a4c3dd6733
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141470
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Armin Le Grand (allotropia)
2022-10-17 19:26:33 +02:00
committed by Miklos Vajna
parent aa674ac4b5
commit 008cf1285d
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
View File

@@ -21,6 +21,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
@@ -32,11 +33,29 @@ namespace drawinglayer::primitive2d
{
void BackgroundColorPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const
{
if(!rViewInformation.getViewport().isEmpty())
// transparency invalid or completely transparent, done
if(getTransparency() < 0.0 || getTransparency() >= 1.0)
return;
// no viewport, not visible, done
if(rViewInformation.getViewport().isEmpty())
return;
// create decompose geometry
const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rViewInformation.getViewport()));
Primitive2DReference aDecompose(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aOutline), getBColor()));
if(getTransparency() != 0.0)
{
const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rViewInformation.getViewport()));
rContainer.push_back(new PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aOutline), getBColor()));
// if used, embed decompose geometry to unified transparency
Primitive2DContainer aContent { aDecompose };
aDecompose = Primitive2DReference(
new UnifiedTransparencePrimitive2D(
std::move(aContent),
getTransparency()));
}
rContainer.push_back(aDecompose);
}
BackgroundColorPrimitive2D::BackgroundColorPrimitive2D(