From e1af2e2353bec700baf9369cdf35c4ed4ff4b4fc Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 9 Dec 2014 11:09:42 -0800 Subject: [PATCH] Better leading --- legacy/project/src/common/FreeType.cpp | 4 ++-- legacy/project/src/common/TextField.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/legacy/project/src/common/FreeType.cpp b/legacy/project/src/common/FreeType.cpp index 4a9b21ab7..cf2afb244 100644 --- a/legacy/project/src/common/FreeType.cpp +++ b/legacy/project/src/common/FreeType.cpp @@ -141,7 +141,7 @@ public: int Height() { - return mFace->size->metrics.height/(1<<6); + return (mFace->size->metrics.ascender - mFace->size->metrics.descender)/(1<<6); } @@ -152,7 +152,7 @@ public: FT_Size_Metrics &metrics = mFace->size->metrics; ioMetrics.ascent = std::max( ioMetrics.ascent, (float)metrics.ascender/(1<<6) ); ioMetrics.descent = std::max( ioMetrics.descent, (float)fabs((float)metrics.descender/(1<<6)) ); - ioMetrics.height = std::max( ioMetrics.height, (float)metrics.height/(1<<6) ); + ioMetrics.height = std::max( ioMetrics.height, (float)(mFace->size->metrics.ascender - mFace->size->metrics.descender)/(1<<6) ); } } diff --git a/legacy/project/src/common/TextField.cpp b/legacy/project/src/common/TextField.cpp index 35fce16c1..df2d5de5e 100644 --- a/legacy/project/src/common/TextField.cpp +++ b/legacy/project/src/common/TextField.cpp @@ -1800,7 +1800,7 @@ void TextField::Layout(const Matrix &inMatrix) mLines.push_back(line); line.Clear(); g.UpdateMetrics(line.mMetrics); - y += g.Height() + g.mFormat->leading - 2; + y += g.Height() + g.mFormat->leading + 1; continue; } } @@ -1835,7 +1835,7 @@ void TextField::Layout(const Matrix &inMatrix) line.mMetrics.width = Round6(last_word_x6); } mLines.push_back(line); - y += g.Height() + g.mFormat->leading - 2; + y += g.Height() + g.mFormat->leading + 1; x6 = gap<<6; line.Clear(); g.UpdateMetrics(line.mMetrics);