Merge "Removing Control::OnAccessibilityTouch" into devel/master
authorDavid Steele <david.steele@samsung.com>
Thu, 20 Aug 2020 13:00:25 +0000 (13:00 +0000)
committerGerrit Code Review <gerrit@review>
Thu, 20 Aug 2020 13:00:25 +0000 (13:00 +0000)
dali-toolkit/internal/text/layouts/layout-engine.cpp

index e13c842..5e5cce7 100755 (executable)
@@ -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;