Revert "Fix issue where vertical alignment "CENTER" does not align based on line...

This reverts commit f710ec338068577b60dacf94a6da40f4498c7ddc.

Change-Id: I1690f16c798bba4e0553d3046e0581531edf2a1c

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index 596d0a568f6f57c567fc732797adfb36ea5b26e1..6437a0cfc139f20489f46cc2344380be9337fb7c 100644 (file)
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -1941,14 +1941,6 @@ struct Engine::Impl
           hyphensCount--;
         }
 
-        if(!isMultiline)
-        {
-          // Recalculate line spacing and line height
-          LineRun& lastLineRun = *(lines.End() - 1u);
-          lastLineRun.lineSpacing = GetLineSpacing(lastLineRun.ascender + -lastLineRun.descender, layout.relativeLineSize);
-          layoutSize.height = GetLineHeight(lastLineRun, 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 c493430c391d8815bca5f0842552c31045e95a9b..52747a3ccd6675c152c3627c3052d9d3e2f46412 100644 (file)
--- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@ -267,6 +267,8 @@ Devel::PixelBuffer Typesetter::RenderWithPixelBuffer(const Vector2& size, Toolki
     case VerticalAlignment::CENTER:
     {
       penY = static_cast<int32_t>(std::round(0.5f * (size.height - layoutSize.height)));
+      penY = penY < 0.f ? 0.f : penY;
+
       break;
     }
     case VerticalAlignment::BOTTOM: