diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-07 08:03:22 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-07 23:12:41 +0200 |
| commit | 99c337d1d3831ce9d2c7dc1cbff713f4ac49d6ac (patch) | |
| tree | 180ce025817e2eaea8ff23e9325bb7abed3c5a81 /drawinglayer/source | |
| parent | a640676e06bdab3471f5c9f04dd9403bc66ddc22 (diff) | |
tdf#132199: put glow before shadow, to have shadow of the glow
Also take modified color into account when drawing glow.
Change-Id: Iba136d2695cb783d13ff251d087066c2e8803d63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93605
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'drawinglayer/source')
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 6c14c09c1a19..cb0e3124b19d 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -975,7 +975,9 @@ void VclPixelProcessor2D::processGlowPrimitive2D(const primitive2d::GlowPrimitiv BitmapFilter::Filter(mask, BitmapFilterStackBlur(fBlurRadius)); // The end result is the bitmap filled with glow color and blurred 8-bit alpha mask - bitmap.Erase(rCandidate.getGlowColor()); + const basegfx::BColor aGlowColor( + maBColorModifierStack.getModifiedColor(rCandidate.getGlowColor().getBColor())); + bitmap.Erase(Color(aGlowColor)); // alpha mask will be scaled up automatically to match bitmap BitmapEx result(bitmap, AlphaMask(mask.GetBitmap())); |