From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 4 Feb 2015 15:58:38 +0000 (+0000)
Subject: Change FontMetrics format to match GlyphMetrics
X-Git-Tag: new_text_0.1~56
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=373fa06ca9a31b54b6b64632a36a850513b8b6e3

Change FontMetrics format to match GlyphMetrics

Change-Id: Ie098d4a45779b9952c670a78855c8cd54e44ad53
---

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<glyphCount; ++i )
       {
         GlyphInfo glyph;
         visualModel.GetGlyphs( i, &glyph, 1 );
 
-        if( glyph.width > 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;
       }