Merge "Updates required for https://review.tizen.org/gerrit/#/c/41602/" into devel...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / visual-model-impl.cpp

diff --git a/dali-toolkit/internal/text/visual-model-impl.cpp b/dali-toolkit/internal/text/visual-model-impl.cpp
index c070179..beeb08b 100644 (file)
--- a/dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/dali-toolkit/internal/text/visual-model-impl.cpp
@@ -36,9 +36,9 @@ VisualModelPtr VisualModel::New()
   return VisualModelPtr( new VisualModel() );
 }
 
-void VisualModel::SetGlyphs( const GlyphInfo* glyphs,
-                             const CharacterIndex* characterIndices,
-                             const Length* charactersPerGlyph,
+void VisualModel::SetGlyphs( const GlyphInfo* const glyphs,
+                             const CharacterIndex* const characterIndices,
+                             const Length* const charactersPerGlyph,
                              Length numberOfGlyphs )
 {
   if( 0u == numberOfGlyphs )
@@ -225,7 +225,7 @@ void VisualModel::GetGlyphsPerCharacterMap( Length* glyphsPerCharacter,
   memcpy( glyphsPerCharacter, mGlyphsPerCharacter.Begin() + characterIndex, numberOfCharacters * sizeof( Length ) );
 }
 
-void VisualModel::SetGlyphPositions( const Vector2* glyphPositions,
+void VisualModel::SetGlyphPositions( const Vector2* const glyphPositions,
                                      Length numberOfGlyphs )
 {
   if( 0u == numberOfGlyphs )
@@ -441,6 +441,11 @@ void VisualModel::SetUnderlineEnabled( bool enabled )
   mUnderlineEnabled = enabled;
 }
 
+void VisualModel::SetUnderlineHeight( float height )
+{
+  mUnderlineHeight = height;
+}
+
 const Vector4& VisualModel::GetTextColor() const
 {
   return mTextColor;
@@ -466,6 +471,11 @@ bool VisualModel::IsUnderlineEnabled() const
   return mUnderlineEnabled;
 }
 
+float VisualModel::GetUnderlineHeight() const
+{
+  return mUnderlineHeight;
+}
+
 void VisualModel::ClearCaches()
 {
   mCachedLineIndex = 0u;
@@ -483,10 +493,11 @@ VisualModel::VisualModel()
   mGlyphsPerCharacter(),
   mGlyphPositions(),
   mLines(),
-  mTextColor(),
-  mShadowColor(),
-  mUnderlineColor(),
-  mShadowOffset(),
+  mTextColor( Color::BLACK ),
+  mShadowColor( Color::BLACK ),
+  mUnderlineColor( Color::BLACK ),
+  mShadowOffset( Vector2::ZERO ),
+  mUnderlineHeight( 0.0f ),
   mNaturalSize(),
   mActualSize(),
   mCachedLineIndex( 0u ),