[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Mike Kaganski (via logerrit)]

 vcl/source/outdev/transparent.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5a67b74e40367f160387a8ccebc52874b4f4ddb6
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 29 16:10:09 2020 +0300
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 30 12:00:35 2020 +0200

    tdf#135264: draw to mpAlphaVDev after DrawTransparentNatively
    
    Otherwise the transparency is lost for the cases where mpAlphaVDev
    is used.
    
    Change-Id: Ic7b92cb69727dbe8901695ba496878f0ea381826
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99694
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit f3c67b783a5dcdf874c6109d36fae8f411e885be)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99730
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index a9e2ae080e8c..717e9584162a 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -695,10 +695,9 @@ void OutputDevice::DrawTransparent( const tools::PolyPolygon& rPolyPoly,
 
     // try hard to draw it directly, because the emulation layers are slower
     bDrawn = DrawTransparentNatively( rPolyPoly, nTransparencePercent );
-    if( bDrawn )
-        return;
 
-    EmulateDrawTransparent( rPolyPoly, nTransparencePercent );
+    if (!bDrawn)
+        EmulateDrawTransparent( rPolyPoly, nTransparencePercent );
 
     // #110958# Apply alpha value also to VDev alpha channel
     if( mpAlphaVDev )