From: joogab yun <joogab.yun@samsung.com>
Date: Tue, 28 Jun 2022 01:06:30 +0000 (+0000)
Subject: Merge "Allows TextField and TextEditor to propagate PanGestures." into devel/master
X-Git-Tag: dali_2.1.29~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=f878d2e5cfbe3f3950b26d8d5967a30cee48a198;hp=1c6aa75cb7b66fdab6bff180c19066204171ef1e

Merge "Allows TextField and TextEditor to propagate PanGestures." into devel/master
---

diff --git a/dali-toolkit/internal/text/emoji-helper.cpp b/dali-toolkit/internal/text/emoji-helper.cpp
index eec4ee4..c458fd0 100644
--- a/dali-toolkit/internal/text/emoji-helper.cpp
+++ b/dali-toolkit/internal/text/emoji-helper.cpp
@@ -77,7 +77,7 @@ bool IsNewKeycapSequence(const Character* const   textBuffer,
   // Default initialization does not keycap sequence
   bool isNewKeycapSequence = false;
 
-  if(currentCharacterIndex < lastCharacterIndex)
+  if(currentCharacterIndex <= lastCharacterIndex)
   {
     Character currentCharacter = *(textBuffer + currentCharacterIndex);
     if(IsStartForKeycapSequence(currentCharacter))
@@ -112,7 +112,7 @@ bool IsNewVariationSelectorSequence(const Character* const         textBuffer,
   // Default initialization does not VariationSelector sequence
   bool isNewVariationSelectorSequence = false;
 
-  if(currentCharacterIndex < lastCharacterIndex)
+  if(currentCharacterIndex <= lastCharacterIndex)
   {
     Character currentCharacter = *(textBuffer + currentCharacterIndex);
     if(TextAbstraction::IsEmojiVariationSequences(currentCharacter))
diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index 52f2b18..96210ca 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -205,9 +205,9 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
   currentScriptRun.isRightToLeft = false;
 
   // Traverse all characters and set the scripts.
-  const Length lastCharacter = startIndex + numberOfCharacters;
+  const Length lastCharacter = startIndex + numberOfCharacters - 1u;
 
-  for(Length index = startIndex; index < lastCharacter; ++index)
+  for(Length index = startIndex; index <= lastCharacter; ++index)
   {
     Character character = *(textBuffer + index);
 
@@ -223,7 +223,7 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
     //   script of the first character of the paragraph with a defined script.
 
     // Skip those characters valid for many scripts like white spaces or '\n'.
-    bool endOfText = index == lastCharacter;
+    bool endOfText = index > lastCharacter;
 
     //Handle all Emoji Sequence cases
     if(IsNewSequence(textBuffer, currentScriptRun.script, index, lastCharacter, script))
@@ -280,7 +280,7 @@ void MultilanguageSupport::SetScripts(const Vector<Character>& text,
 
       // Get the next character.
       ++index;
-      endOfText = index == lastCharacter;
+      endOfText = index > lastCharacter;
       if(!endOfText)
       {
         character = *(textBuffer + index);
@@ -471,8 +471,8 @@ void MultilanguageSupport::ValidateFonts(const Vector<Character>&
   FontId                  previousEmojiFontId = 0u;
   TextAbstraction::Script previousScript      = TextAbstraction::UNKNOWN;
 
-  CharacterIndex lastCharacter = startIndex + numberOfCharacters;
-  for(Length index = startIndex; index < lastCharacter; ++index)
+  CharacterIndex lastCharacter = startIndex + numberOfCharacters - 1u;
+  for(Length index = startIndex; index <= lastCharacter; ++index)
   {
     // Get the current character.
     const Character character        = *(textBuffer + index);
diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 1a14e47..530af02 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 27;
+const unsigned int TOOLKIT_MICRO_VERSION = 28;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index c4436de..4ed9b41 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.1.27
+Version:    2.1.28
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT