From 373fa06ca9a31b54b6b64632a36a850513b8b6e3 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Wed, 4 Feb 2015 15:58:38 +0000
Subject: [PATCH 1/1] Change FontMetrics format to match GlyphMetrics
Change-Id: Ie098d4a45779b9952c670a78855c8cd54e44ad53
---
base/dali-toolkit/public-api/text/text-controller.cpp | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/base/dali-toolkit/public-api/text/text-controller.cpp b/base/dali-toolkit/public-api/text/text-controller.cpp
index 2c8ff38..441ac62 100644
--- a/base/dali-toolkit/public-api/text/text-controller.cpp
+++ b/base/dali-toolkit/public-api/text/text-controller.cpp
@@ -157,20 +157,16 @@ void Controller::UpdateVisualPositions()
visualModel.GetGlyphs( 0, &firstGlyph, 1 );
mImpl->mFontClient.GetFontMetrics( firstGlyph.fontId, fontMetrics );
- int penX( 0 );
- int penY( fontMetrics.ascender ); // Move to baseline
+ float penX( 0 );
+ float penY( fontMetrics.ascender ); // Move to baseline
for( unsigned int i=0; i 0 &&
- glyph.height > 0 ) // Skip whitespace
- {
- glyphPositions.push_back( Vector2( penX + glyph.xBearing,
- penY - glyph.yBearing ) );
- }
+ glyphPositions.push_back( Vector2( penX + glyph.xBearing,
+ penY - glyph.yBearing ) );
penX += glyph.advance;
}
--
2.7.4