From 5ec09a40290b3a26497729c8742c9de510eb3d50 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 31 Aug 2018 15:20:02 +0000
Subject: [PATCH] CtrlCore: Cocoa font metrics improved

git-svn-id: svn://ultimatepp.org/upp/trunk@12215 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CocoDrawText.mm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/uppsrc/CtrlCore/CocoDrawText.mm b/uppsrc/CtrlCore/CocoDrawText.mm
index 15eb41c17..3e3a063c4 100644
--- a/uppsrc/CtrlCore/CocoDrawText.mm
+++ b/uppsrc/CtrlCore/CocoDrawText.mm
@@ -93,18 +93,18 @@ CommonFontInfo GetFontInfoSys(Font font)
 	if(ctfont) {
 	#if 0
 		DDUMP(font);
+	    DDUMP(CTFontGetSize(ctfont));
 	    DDUMP(CTFontGetAscent(ctfont));
 	    DDUMP(CTFontGetDescent(ctfont));
-	    DDUMP(CTFontGetLeading(ctfont));
+	    DDUMP();
 	    DDUMP(CTFontGetXHeight(ctfont));
 	    DDUMP(CTFontGetUnderlinePosition(ctfont));
+	    DDUMP(MakeRect(CTFontGetBoundingBox(ctfont)));
 		DDUMPHEX(CTFontGetSymbolicTraits(ctfont));
 	#endif
-		fi.ascent = ceil(CTFontGetAscent(ctfont));
 		fi.descent = ceil(CTFontGetDescent(ctfont));
-		fi.height = fi.ascent + fi.descent;
-		fi.lineheight = fi.height; // TODO!
-		fi.external = 0;
+		fi.ascent = ceil(CTFontGetAscent(ctfont));
+		fi.external = ceil(CTFontGetLeading(ctfont));
 		fi.internal = 0;
 		fi.overhang = 0;
 		fi.maxwidth = GetGlyphInfoSys(ctfont, 'W', synth && font.IsBold()).width; // TODO?