From: joogab yun <joogab.yun@samsung.com>
Date: Thu, 4 Mar 2021 06:53:55 +0000 (+0000)
Subject: Merge "Prevent height adjustment of TextLabel" into devel/master
X-Git-Tag: dali_2.0.16~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8f550700dbe3304f217b3dc7a240854089b8b4e;hp=c87b2e1b8bde8db53067b24e191a1adf9deeb8db;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge "Prevent height adjustment of TextLabel" into devel/master
---

diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp
index 8888859..a900601 100644
--- a/dali-toolkit/internal/text/text-controller-relayouter.cpp
+++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp
@@ -651,7 +651,9 @@ void Controller::Relayouter::CalculateVerticalOffset(Controller& controller, con
     layoutSize.height = defaultFontLineHeight;
   }
 
-  if (layoutSize.height != defaultFontLineHeight)
+  // Whether the text control is editable
+  const bool isEditable = NULL != impl.mEventData;
+  if (isEditable && layoutSize.height != defaultFontLineHeight)
   {
     // This code prevents the wrong positioning of cursor when the layout size is bigger/smaller than defaultFontLineHeight.
     // This situation occurs when the size of placeholder text is different from the default text.