Merge "fix issue with text size with negative line spacing" into devel/master

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
Simple merge

diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
index 8c8ea94,a85f5f6..53030e2
--- 1/dali-toolkit/internal/text/layouts/layout-engine.cpp
--- 2/dali-toolkit/internal/text/layouts/layout-engine.cpp
+++ b/dali-toolkit/internal/text/layouts/layout-engine.cpp
@@@ -1447,9 -1417,12 +1454,9 @@@ struct Engine::Imp
      lineRun.direction                       = LTR;
      lineRun.ellipsis                        = false;
  
 -    lineRun.lineSpacing = mDefaultLineSize - (lineRun.ascender + -lineRun.descender);
 -    lineRun.lineSpacing = lineRun.lineSpacing < 0.f ? 0.f : lineRun.lineSpacing;
 -
 -    lineRun.lineSpacing += mDefaultLineSpacing;
 +    lineRun.lineSpacing = GetLineSpacing(lineRun.ascender + -lineRun.descender);
  
-     layoutSize.height += GetLineHeight(lineRun);
+     layoutSize.height += GetLineHeight(lineRun, true);
    }
  
    /**