Added underline position and thickness to FontMetrics

Change-Id: I036851956f96fe604a30da0ba3c1be4a51eaf325
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
index 5e77174..ba1dd01 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
+++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
@@ -749,7 +749,9 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path,
             // Indicate that the font is a fixed sized bitmap
             FontMetrics metrics( fixedHeight,
                                  0.0f,
-                                 fixedHeight );
+                                 fixedHeight,
+                                 0.0f,
+                                 0.0f );
 
             mFontCache.push_back( CacheItem( ftFace, path, pointSize, faceIndex, metrics, fixedWidth, fixedHeight ) );
             id = mFontCache.size();
@@ -796,7 +798,9 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path,
 
         FontMetrics metrics( static_cast< float >( ftMetrics.ascender  ) * FROM_266,
                              static_cast< float >( ftMetrics.descender ) * FROM_266,
-                             static_cast< float >( ftMetrics.height    ) * FROM_266 );
+                             static_cast< float >( ftMetrics.height    ) * FROM_266,
+                             static_cast< float >( ftFace->underline_position ) * FROM_266,
+                             static_cast< float >( ftFace->underline_thickness ) * FROM_266 );
 
         mFontCache.push_back( CacheItem( ftFace, path, pointSize, faceIndex, metrics ) );
         id = mFontCache.size();

diff --git a/text/dali/public-api/text-abstraction/font-metrics.cpp b/text/dali/public-api/text-abstraction/font-metrics.cpp
index f1a172c..63145d4 100644 (file)
--- a/text/dali/public-api/text-abstraction/font-metrics.cpp
+++ b/text/dali/public-api/text-abstraction/font-metrics.cpp
@@ -33,10 +33,14 @@ FontMetrics::FontMetrics()
 
 FontMetrics::FontMetrics( float ascenderPixels,
                           float descenderPixels,
-                          float heightPixels )
+                          float heightPixels,
+                          float underlinePositionPixels,
+                          float underlineThicknessPixels )
 : ascender( ascenderPixels ),
   descender( descenderPixels ),
-  height( heightPixels )
+  height( heightPixels ),
+  underlinePosition( underlinePositionPixels ),
+  underlineThickness( underlineThicknessPixels )
 {
 }
 

diff --git a/text/dali/public-api/text-abstraction/font-metrics.h b/text/dali/public-api/text-abstraction/font-metrics.h
index 5d274c8..3649dab 100644 (file)
--- a/text/dali/public-api/text-abstraction/font-metrics.h
+++ b/text/dali/public-api/text-abstraction/font-metrics.h
@@ -42,11 +42,15 @@ struct DALI_IMPORT_API FontMetrics
    */
   FontMetrics( float ascenderPixels,
                float descenderPixels,
-               float heightPixels );
-
-  float ascender;   ///< The ascender in pixels.
-  float descender;  ///< The descender in pixels.
-  float height;     ///< The height in pixels.
+               float heightPixels,
+               float underlinePositionPixels,
+               float underlinePositionThickness );
+
+  float ascender;             ///< The ascender in pixels.
+  float descender;            ///< The descender in pixels.
+  float height;               ///< The height in pixels.
+  float underlinePosition;    ///< The underline position in pixels.
+  float underlineThickness;   ///< The vertical height of the underline in pixels.
 };
 
 } // Dali