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

Tor Lillqvist tml at collabora.com
Wed Jan 24 16:27:31 UTC 2018


 vcl/quartz/ctfonts.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e9a6a9e59a38a77d383dcbe1e289e7e5a6db8554
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 23 15:04:00 2018 +0200

    tdf#69254: Tweak mapping from CoreText weight to our FontWeight a bit
    
    Make the mapping of light weights more likely to hit different enum
    values for slightly different weights.
    
    We want to be able to distinguish between for instance Overpass Light
    (with weight -0.4) and Overpass ExtraLight (with weight -0.5).
    
    Change-Id: If83fbce68149b267a49ef9bcb6624d8790de7c56
    Reviewed-on: https://gerrit.libreoffice.org/48438
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index c31dcc329e2b..ebb7066be9d8 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -397,7 +397,7 @@ FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool* bFont
     }
     else if( fWeight < 0 )
     {
-        nInt = rint(WEIGHT_NORMAL + fWeight * ((WEIGHT_NORMAL - WEIGHT_THIN)/0.9));
+        nInt = rint(WEIGHT_NORMAL + fWeight * ((WEIGHT_NORMAL - WEIGHT_THIN)/0.8));
         if( nInt < WEIGHT_THIN )
         {
             nInt = WEIGHT_THIN;


More information about the Libreoffice-commits mailing list