X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-engine.cpp;h=89c01ca46600ae4cd7f8193b46ade13d432e79f6;hb=2f976883ceece5f26123a64f85ef068c25ddfa90;hp=e91ebae1391ab41f3f215738ddabb170cd7c8bbe;hpb=552104639275e0c54925ee620831e425e775538d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index e91ebae..89c01ca 100755
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -52,7 +52,8 @@ namespace
 const float MAX_FLOAT = std::numeric_limits<float>::max();
 const CharacterDirection LTR = false;
 const CharacterDirection RTL = !LTR;
-const float LINE_SPACING= 0.f;
+const float LINE_SPACING = 0.f;
+const float MIN_LINE_SIZE = 0.f;
 
 inline bool isEmptyLineAtLast( const Vector<LineRun>& lines, const Vector<LineRun>::Iterator& line )
 {
@@ -130,7 +131,8 @@ struct Engine::Impl
   Impl()
   : mLayout{ Layout::Engine::SINGLE_LINE_BOX },
     mCursorWidth{ 0.f },
-    mDefaultLineSpacing{ LINE_SPACING }
+    mDefaultLineSpacing{ LINE_SPACING },
+    mDefaultLineSize{ MIN_LINE_SIZE }
   {
   }
 
@@ -162,8 +164,12 @@ struct Engine::Impl
     // Sets the minimum descender.
     lineLayout.descender = std::min( lineLayout.descender, fontMetrics.descender );
 
-    // set the line spacing
-    lineLayout.lineSpacing = mDefaultLineSpacing;
+    // Sets the line size
+    lineLayout.lineSpacing = mDefaultLineSize - ( lineLayout.ascender + -lineLayout.descender );
+    lineLayout.lineSpacing = lineLayout.lineSpacing < 0.f ? 0.f : lineLayout.lineSpacing;
+
+    // Add the line spacing
+    lineLayout.lineSpacing += mDefaultLineSpacing;
   }
 
   /**
@@ -664,7 +670,7 @@ struct Engine::Impl
       const GlyphInfo& glyph = *( glyphsBuffer + i );
       Vector2& position = *( glyphPositionsBuffer + i );
 
-      position.x = std::roundf( penX + glyph.xBearing );
+      position.x = penX + glyph.xBearing;
       position.y = -glyph.yBearing;
 
       penX += ( glyph.advance + interGlyphExtraAdvance );
@@ -726,7 +732,7 @@ struct Engine::Impl
         const GlyphInfo& glyph = *( glyphsBuffer + glyphIndex );
         Vector2& position = *( glyphPositionsBuffer + glyphIndex - layoutParameters.startGlyphIndex );
 
-        position.x = std::round( penX + glyph.xBearing );
+        position.x = penX + glyph.xBearing;
         position.y = -glyph.yBearing;
 
        penX += ( glyph.advance + layoutParameters.interGlyphExtraAdvance );
@@ -921,8 +927,6 @@ struct Engine::Impl
     lineRun.glyphRun.numberOfGlyphs = layout.numberOfGlyphs;
     lineRun.characterRun.characterIndex = layout.characterIndex;
     lineRun.characterRun.numberOfCharacters = layout.numberOfCharacters;
-    lineRun.lineSpacing = mDefaultLineSpacing;
-
     lineRun.width = layout.length;
     lineRun.extraLength = std::ceil( layout.whiteSpaceLengthEndOfLine );
 
@@ -935,6 +939,12 @@ struct Engine::Impl
     lineRun.direction = layout.direction;
     lineRun.ellipsis = false;
 
+    lineRun.lineSpacing = mDefaultLineSize - ( lineRun.ascender + -lineRun.descender );
+    lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
+
+    lineRun.lineSpacing += mDefaultLineSpacing;
+
+
     // Update the actual size.
     if( lineRun.width > layoutSize.width )
     {
@@ -986,7 +996,11 @@ struct Engine::Impl
     lineRun.alignmentOffset = 0.f;
     lineRun.direction = LTR;
     lineRun.ellipsis = false;
-    lineRun.lineSpacing = mDefaultLineSpacing;
+
+    lineRun.lineSpacing = mDefaultLineSize - ( lineRun.ascender + -lineRun.descender );
+    lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
+
+    lineRun.lineSpacing += mDefaultLineSpacing;
 
     layoutSize.height += ( lineRun.ascender + -lineRun.descender ) + lineRun.lineSpacing;
   }
@@ -1240,7 +1254,7 @@ struct Engine::Impl
         return false;
       }
 
-      // Set the line position. Discard if ellipsis is enabled and the position exceeds the boundaries
+      // Set the line position. DISCARD if ellipsis is enabled and the position exceeds the boundaries
       // of the box.
       penY += layout.ascender;
 
@@ -1346,6 +1360,13 @@ struct Engine::Impl
 
         // Updates the vertical pen's position.
         penY += -layout.descender + layout.lineSpacing + mDefaultLineSpacing;
+        // If there is a defaultLineSize, updates the pen's position.
+        if( mDefaultLineSize > 0.f )
+        {
+          float lineSpacing = mDefaultLineSize - ( layout.ascender + -layout.descender );
+          lineSpacing = lineSpacing < 0.f ? 0.f : lineSpacing;
+          penY += lineSpacing;
+        }
 
         // Increase the glyph index.
         index = nextIndex;
@@ -1551,6 +1572,7 @@ struct Engine::Impl
   Type mLayout;
   float mCursorWidth;
   float mDefaultLineSpacing;
+  float mDefaultLineSize;
 
   IntrusivePtr<Metrics> mMetrics;
 };
@@ -1632,6 +1654,16 @@ float Engine::GetDefaultLineSpacing() const
   return mImpl->mDefaultLineSpacing;
 }
 
+void Engine::SetDefaultLineSize( float lineSize )
+{
+  mImpl->mDefaultLineSize = lineSize;
+}
+
+float Engine::GetDefaultLineSize() const
+{
+  return mImpl->mDefaultLineSize;
+}
+
 } // namespace Layout
 
 } // namespace Text