[Tizen] Fix issue where vertical alignment "CENTER" does not align based on line...

Change-Id: I7b68c67246b58f40306e4c6170245a5f50e35919

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index 493be13ceca404852d6ff8a70518ce5b80c29a2c..246d75a3474deb476af3af2dcc6bcfce83b88d77 100644 (file)
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -1894,6 +1894,14 @@ struct Engine::Impl
           hyphensCount--;
         }
 
+        if(!isMultiline)
+        {
+          // Recalculate line spacing and line height
+          LineRun& firstLineRun = *(lines.Begin());
+          firstLineRun.lineSpacing = GetLineSpacing(firstLineRun.ascender + -firstLineRun.descender, layout.relativeLineSize);
+          layoutSize.height = GetLineHeight(firstLineRun, false);
+        }
+
         // No more lines to layout.
         break;
       }

diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
index a4311208216f08c811d043e7616807a945918d91..3eed37609ee6b4ddf7bb1b83ee644e071a2f972e 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@ -929,8 +929,7 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect
     }
     case VerticalAlignment::CENTER:
     {
-      penY = static_cast<int32_t>(0.5f * (size.height - layoutSize.height));
-      penY = penY < 0.f ? 0.f : penY;
+      penY = static_cast<int32_t>(std::round(0.5f * (size.height - layoutSize.height)));
       break;
     }
     case VerticalAlignment::BOTTOM: