From 45bd603f9f21623787a044f0167b9ca5fd357782 Mon Sep 17 00:00:00 2001 From: Sungyeon Woo Date: Wed, 12 Jun 2013 12:11:54 +0900 Subject: [PATCH] modified GetLeading() Change-Id: Ie8843c51a5e95c7b53e448bdd180c166ecc7559e Signed-off-by: Sungyeon Woo --- src/graphics/FGrp_Font.cpp | 4 +++- src/graphics/FGrp_Font.h | 2 ++ src/graphics/FGrp_FontFt2.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/graphics/FGrp_Font.cpp mode change 100755 => 100644 src/graphics/FGrp_Font.h diff --git a/src/graphics/FGrp_Font.cpp b/src/graphics/FGrp_Font.cpp old mode 100755 new mode 100644 index 242eeee..6aedde8 --- a/src/graphics/FGrp_Font.cpp +++ b/src/graphics/FGrp_Font.cpp @@ -1720,7 +1720,7 @@ _Font::GetStyle(void) const _Util::FixedPoint26_6 _Font::GetLeading(void) const { - return __fontAttrib.maxHeight; + return __fontAttrib.ascender - __fontAttrib.descender + __fontAttrib.leading; } result @@ -2245,6 +2245,7 @@ _Font::__UpdateFontAttribute(int style, _Util::FixedPoint26_6 pcSize) __fontAttrib.maxHeight = sizeProperty.maxHeight; __fontAttrib.ascender = sizeProperty.ascender; __fontAttrib.descender = sizeProperty.descender; + __fontAttrib.leading = sizeProperty.leading; } else { @@ -2255,6 +2256,7 @@ _Font::__UpdateFontAttribute(int style, _Util::FixedPoint26_6 pcSize) __fontAttrib.maxHeight.Reset(0); __fontAttrib.ascender.Reset(0); __fontAttrib.descender.Reset(0); + __fontAttrib.leading.Reset(0); } } diff --git a/src/graphics/FGrp_Font.h b/src/graphics/FGrp_Font.h old mode 100755 new mode 100644 index de9b8cb..2697f51 --- a/src/graphics/FGrp_Font.h +++ b/src/graphics/FGrp_Font.h @@ -68,6 +68,7 @@ struct _FontAttribute int charSpace; _Util::FixedPoint26_6 ascender; _Util::FixedPoint26_6 descender; + _Util::FixedPoint26_6 leading; int lineThickness; bool strikeout; bool underline; @@ -81,6 +82,7 @@ struct _FontAttribute charSpace = 0; ascender.Reset(0); descender.Reset(0); + leading.Reset(0); lineThickness = -1; strikeout = false; underline = false; diff --git a/src/graphics/FGrp_FontFt2.cpp b/src/graphics/FGrp_FontFt2.cpp index 1b0bd60..544e3ce 100644 --- a/src/graphics/FGrp_FontFt2.cpp +++ b/src/graphics/FGrp_FontFt2.cpp @@ -759,7 +759,7 @@ _FontFt2::GetFontSizeProperty(SizeProperty& sizeProperty) const sizeProperty.baseLine.Reset(pFace->size->metrics.height + pFace->size->metrics.descender); sizeProperty.ascender.Reset(pFace->size->metrics.ascender); sizeProperty.descender.Reset(pFace->size->metrics.descender); // (-) - sizeProperty.leading.Reset(pFace->size->metrics.height - pFace->size->metrics.ascender + pFace->size->metrics.descender); + sizeProperty.leading.Reset(pFace->bbox.yMax - pFace->size->metrics.ascender > 0 ? pFace->bbox.yMax - pFace->size->metrics.ascender : 0); if (_CompareFamilyForTitling(pFace->family_name)) -- 2.7.4