[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/quartz

[Xisco Fauli (via logerrit)]

 vcl/quartz/salgdicommon.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b6a3d0566628e2d8416708d0410193435a3b8e53
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Sat Jun 1 19:45:53 2019 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue Jun 4 10:21:14 2019 +0200

    tdf#125506 tdf#121241: only use rObjectToDevice if needed
    
    Use same logic as in vcl/unx/generic/gdi/gdiimpl.cxx
    
    Reviewed-on: https://gerrit.libreoffice.org/73319
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 93477d1a963e38e3319013e43835a8ffef200972)
    Reviewed-on: https://gerrit.libreoffice.org/73328
    
    Change-Id: I7a7a8c4b3355f5621ba1603939a3757cd03e7777
    Reviewed-on: https://gerrit.libreoffice.org/73396
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 2e22d6077a2e..aaed9261064d 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -864,8 +864,10 @@ bool AquaSalGraphics::drawPolyLine(
         return false;
 #endif
 
-    // Transform to DeviceCoordinates, get DeviceLineWidth, execute PixelSnapHairline
-    const basegfx::B2DVector aLineWidths(rObjectToDevice * rLineWidths);
+    // need to check/handle LineWidth when ObjectToDevice transformation is used
+    const basegfx::B2DVector aDeviceLineWidths(rObjectToDevice * rLineWidths);
+    const bool bCorrectLineWidth(aDeviceLineWidths.getX() < 1.0 && rLineWidths.getX() >= 1.0);
+    const basegfx::B2DVector aLineWidths(bCorrectLineWidth ? rLineWidths : aDeviceLineWidths);
 
     // #i101491# Aqua does not support B2DLineJoin::NONE; return false to use
     // the fallback (own geometry preparation)