From: David Steele <david.steele@samsung.com>
Date: Thu, 20 Aug 2020 13:00:25 +0000 (+0000)
Subject: Merge "Removing Control::OnAccessibilityTouch" into devel/master
X-Git-Tag: dali_1.9.26~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0d21873fa0ed7e36f823b0fc541f231da674fe87;hp=3928808cc2029cbfd59230f2edb8889a63a59cec

Merge "Removing Control::OnAccessibilityTouch" into devel/master
---

diff --git a/dali-toolkit/internal/text/layouts/layout-engine.cpp b/dali-toolkit/internal/text/layouts/layout-engine.cpp
index e13c842..5e5cce7 100755
--- a/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@ -1360,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;