[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - drawinglayer/source

[Andrés Maldonado (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8afbdca88d55c06ced483b9b0c63fc8ab532314a
Author:     Andrés Maldonado <amaldona at tutanota.com>
AuthorDate: Thu Dec 26 22:46:36 2019 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sat Dec 28 00:38:44 2019 +0100

    tdf#125901: apply color modifiers when drawing hatch
    
    With this fix, the shadow of a shape with a Hatching fill is no longer
    the same color as the hatching (in full screen mode)
    
    Change-Id: I979866e748b5caf2ccafc8a6084ffdb46bc8122c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/73964
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 9c64e8a2948c379c537ee0882afa57882facb26e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85864
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 05e373ebbc26..ee63b8160421 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1807,7 +1807,7 @@ namespace drawinglayer
                     aTransform,
                     false,
                     eHatch,
-                    Color(rFillHatchAttribute.getColor()),
+                    Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
                     SvtGraphicFill::GradientType::Linear,
                     Color(),
                     Color(),
@@ -1828,7 +1828,7 @@ namespace drawinglayer
 
             mpOutputDevice->DrawHatch(aToolsPolyPolygon,
                 Hatch(aHatchStyle,
-                    Color(rFillHatchAttribute.getColor()),
+                    Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
                     basegfx::fround(rFillHatchAttribute.getDistance()),
                     basegfx::fround(rFillHatchAttribute.getAngle() / F_PI1800)));