[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - canvas/source
canvas/source/vcl/canvashelper_texturefill.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f7fa0cc2ff64b81d96b160584a534f2f91e8a15 Author: Michael Stahl Date: Wed Mar 7 12:21:45 2018 +0100 VCL canvas: fix clipping of gradients (related: tdf#115142) When using the presenter console, the secondary screen has a small view of the current slide, which is called a "Pane" in sdext. Clipping for this is done by sd::presenter::PresenterCanvas, which wraps the full-screen VCL canvas and has a MergeViewState() to intersect the clip region. The VCL canvas has a bug in its gradientFill() implemenation where it overrides the existing clip on the OutputDevice instead of intersecting it. This properly fixes the bug that was wrongly and badly attempted to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90. Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff (cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551) Reviewed-on: https://gerrit.libreoffice.org/50888 Tested-by: Michael Stahl Reviewed-by: Thorsten Behrens (cherry picked from commit c59c43ecfb7b858557c82bb3733ba72f0f23d3df) Reviewed-on: https://gerrit.libreoffice.org/50931 Reviewed-by: Christian Lohmaier Reviewed-by: Mike Kaganski Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 61a8eaa5cb75..cfb1e4f6bb7a 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -604,7 +604,7 @@ namespace vclcanvas const vcl::Region aPolyClipRegion( rPoly ); rOutDev.Push( PushFlags::CLIPREGION ); -rOutDev.SetClipRegion( aPolyClipRegion ); +rOutDev.IntersectClipRegion( aPolyClipRegion ); doGradientFill( rOutDev, rValues, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - canvas/source
canvas/source/vcl/canvashelper_texturefill.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b327393da7fb0fb2e28a3571502a95869b225744 Author: Thorsten Behrens Date: Wed Mar 7 22:30:31 2018 +0100 VCL canvas: fix another clipping mistake (related: tdf#115142) Follow-up to 5d710cf7dda27e78f237211fd92418be4dd1c551 - setupOutDevState() tends to set a clip, better not overwrite that. Change-Id: I52aa7db3ef12e9c2902016460e1bf4914328dc7c Reviewed-on: https://gerrit.libreoffice.org/50920 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit e8ed3dfc35975b9e57da7803168f3e2a117a4004) Reviewed-on: https://gerrit.libreoffice.org/50940 Tested-by: Michael Stahl (cherry picked from commit 5acef0c01a38cb9217bef5b38ba521c23c304e0f) Reviewed-on: https://gerrit.libreoffice.org/50956 Reviewed-by: Christian Lohmaier Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 3250fc879746..61a8eaa5cb75 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -1064,7 +1064,7 @@ namespace vclcanvas const vcl::Region aPolyClipRegion( aPolyPoly ); rOutDev.Push( PushFlags::CLIPREGION ); -rOutDev.SetClipRegion( aPolyClipRegion ); +rOutDev.IntersectClipRegion( aPolyClipRegion ); textureFill( rOutDev, *pGrfObj, @@ -1082,7 +1082,7 @@ namespace vclcanvas OutputDevice& r2ndOutDev( mp2ndOutDev->getOutDev() ); r2ndOutDev.Push( PushFlags::CLIPREGION ); -r2ndOutDev.SetClipRegion( aPolyClipRegion ); +r2ndOutDev.IntersectClipRegion( aPolyClipRegion ); textureFill( r2ndOutDev, *pGrfObj, aPt, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
