From: joogab yun <joogab.yun@samsung.com>
Date: Fri, 17 Jun 2022 08:36:41 +0000 (+0000)
Subject: Merge "If the default algorithm is enabled, there is no need to do "MoveFocus(Toolkit... 
X-Git-Tag: dali_2.1.28~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e818ec3551f62ff66deb68678b142040673eb074;hp=6971d8bc50e36b3b7d62ad07355b41d3fe41af58

Merge "If the default algorithm is enabled, there is no need to do "MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT, deviceName);" because nextFocus is automatically found." into devel/master
---

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 3df6d4b..07dc86d 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -986,7 +986,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event)
         actor.Add(GetFocusIndicatorActor());
       }
     }
-    else
+    else if(!mEnableDefaultAlgorithm)
     {
       // No actor is focused but keyboard focus is activated by the key press
       // Let's try to move the initial focus