diff options
| -rw-r--r-- | drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx | 6 | ||||
| -rw-r--r-- | include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index 3441483a9ac4..ea10d205e2d8 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -50,9 +50,11 @@ namespace drawinglayer } BackgroundColorPrimitive2D::BackgroundColorPrimitive2D( - const basegfx::BColor& rBColor) + const basegfx::BColor& rBColor, + double fTransparency) : BufferedDecompositionPrimitive2D(), maBColor(rBColor), + mfTransparency(fTransparency), maLastViewport() { } @@ -63,7 +65,7 @@ namespace drawinglayer { const BackgroundColorPrimitive2D& rCompare = static_cast<const BackgroundColorPrimitive2D&>(rPrimitive); - return (getBColor() == rCompare.getBColor()); + return (getBColor() == rCompare.getBColor() && getTransparency() == rCompare.getTransparency()); } return false; diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 3b789eb00bcb..def2b431c48d 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -48,6 +48,7 @@ namespace drawinglayer private: /// the fill color to use basegfx::BColor maBColor; + double mfTransparency; /// the last used viewInformation, used from getDecomposition for buffering basegfx::B2DRange maLastViewport; @@ -59,10 +60,12 @@ namespace drawinglayer public: /// constructor explicit BackgroundColorPrimitive2D( - const basegfx::BColor& rBColor); + const basegfx::BColor& rBColor, + double fTransparency = 0); /// data read access const basegfx::BColor& getBColor() const { return maBColor; } + double getTransparency() const { return mfTransparency; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; |