diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-09-25 10:00:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-09-25 19:36:26 +0200 |
| commit | 6965bb07bb33429a7663a3f3ebe58ed89c4327d9 (patch) | |
| tree | a5ff0bab893c3def8d0e3cc755dfa645538ed58a /drawinglayer | |
| parent | 141dfd653f1413cc5fae5a7b9ef356c095f21d3b (diff) | |
forward axial and radial gradient types to VCL too
VCL's drawGradient() can handle them all, at least using a fallback
algorithm. And drawinglayer doesn't know which of them are handled
directly by the VCL backend used.
A catch is that the rendering of tdf#133477 is different, so
keep using drawinglayer for the affected gradient types until somebody
fixes that.
Change-Id: I1719c67c15752c6d1c3431ddfa797ac94d039555
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103376
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 4314c656c389..70ee5c86708e 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -223,7 +223,9 @@ GradientStyle convertGradientStyle(drawinglayer::attribute::GradientStyle eGradi case drawinglayer::attribute::GradientStyle::Rect: return GradientStyle::Rect; case drawinglayer::attribute::GradientStyle::Linear: + return GradientStyle::Linear; default: + assert(false); return GradientStyle::Linear; } } @@ -1184,8 +1186,13 @@ void VclPixelProcessor2D::processFillGradientPrimitive2D( { const attribute::FillGradientAttribute& rFillGradient = rPrimitive.getFillGradient(); - if (rFillGradient.getSteps() > 0 - || rFillGradient.getStyle() != drawinglayer::attribute::GradientStyle::Linear) + // VCL should be able to handle all styles, but for tdf#133477 the VCL result + // is different from processing the gradient manually by drawinglayer + // (and the Writer unittest for it fails). Keep using the drawinglayer code + // until somebody founds out what's wrong and fixes it. + if (rFillGradient.getStyle() != drawinglayer::attribute::GradientStyle::Linear + && rFillGradient.getStyle() != drawinglayer::attribute::GradientStyle::Axial + && rFillGradient.getStyle() != drawinglayer::attribute::GradientStyle::Radial) { process(rPrimitive); return; |