From: Bowon Ryu <bowon.ryu@samsung.com>
Date: Thu, 16 Dec 2021 06:22:46 +0000 (+0000)
Subject: Merge "Fixing Bug: Caret is too big with LineSpacing" into devel/master
X-Git-Tag: dali_2.1.3~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=df3c676eff60f25b4fcc99603c4a07af8390e86a;hp=7956f5a39044145c9f6af24fa6d291a9943800cf

Merge "Fixing Bug: Caret is too big with LineSpacing" into devel/master
---

diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
index ddd0360..c52bf57 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp
@@ -354,9 +354,9 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
   {
     // Recursively children
     const auto childCount = actor.GetChildCount();
-    for(auto i = 0u; i < childCount; ++i)
+    for(auto i = childCount; i > 0u; --i)
     {
-      Dali::Actor child = actor.GetChildAt(i);
+      Dali::Actor child = actor.GetChildAt(i-1);
       if(child && child != focusedActor && IsFocusable(child))
       {
         Rect<float> candidateRect = DevelActor::CalculateScreenExtents(child);
@@ -382,10 +382,10 @@ Actor FindNextFocus(Actor& actor, Actor& focusedActor, Rect<float>& focusedRect,
 
 } // unnamed namespace
 
-Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction)
+Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction)
 {
   Actor nearestActor;
-  if(!focusedActor)
+  if(!focusedActor || !rootActor)
   {
     return nearestActor;
   }
@@ -426,13 +426,7 @@ Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFoc
   ConvertCoordinate(bestCandidateRect);
 
   ConvertCoordinate(focusedRect);
-
-  Integration::SceneHolder window = Integration::SceneHolder::Get(focusedActor);
-  if(window)
-  {
-    Actor rootActor = window.GetRootLayer();
-    nearestActor    = FindNextFocus(rootActor, focusedActor, focusedRect, bestCandidateRect, direction);
-  }
+  nearestActor = FindNextFocus(rootActor, focusedActor, focusedRect, bestCandidateRect, direction);
   return nearestActor;
 }
 
diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.h b/dali-toolkit/devel-api/focus-manager/focus-finder.h
index 47f313d..69708b3 100644
--- a/dali-toolkit/devel-api/focus-manager/focus-finder.h
+++ b/dali-toolkit/devel-api/focus-manager/focus-finder.h
@@ -27,13 +27,15 @@ namespace Toolkit
 {
 namespace FocusFinder
 {
+
 /**
  * Get the nearest focusable actor.
+ * @param [in] rootActor The root actor.
  * @param [in] focusedActor The current focused actor.
  * @param [in] direction The direction.
  * @return The nearest focusable actor, or an empty handle if none exists.
  */
-DALI_TOOLKIT_API Actor GetNearestFocusableActor(Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction);
+DALI_TOOLKIT_API Actor GetNearestFocusableActor(Actor rootActor, Actor focusedActor, Toolkit::Control::KeyboardFocus::Direction direction);
 
 } // namespace FocusFinder
 
diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 745da15..8c737d2 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -517,7 +517,11 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
       else if(mEnableDefaultAlgorithm)
       {
         // We should find it among the actors nearby.
-        nextFocusableActor = Toolkit::FocusFinder::GetNearestFocusableActor(currentFocusActor, direction);
+        Integration::SceneHolder window = Integration::SceneHolder::Get(currentFocusActor);
+        if(window)
+        {
+          nextFocusableActor = Toolkit::FocusFinder::GetNearestFocusableActor(window.GetRootLayer(), currentFocusActor, direction);
+        }
       }
     }