From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Fri, 4 Mar 2022 03:02:45 +0000 (+0000)
Subject: Merge "fix issue with text size with negative line spacing" into devel/master
X-Git-Tag: submit/tizen/20220310.080704^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85cc4dec9417a45d031bc8bc968e82df3339159e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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

85cc4dec9417a45d031bc8bc968e82df3339159e
diff --cc dali-toolkit/internal/text/layouts/layout-engine.cpp
index 8c8ea9424c,a85f5f6b30..53030e2564
--- a/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);
    }
  
    /**