From: dongsug.song <dongsug.song@samsung.com>
Date: Fri, 31 Mar 2017 05:43:56 +0000 (+0900)
Subject: [Tizen] Do nothing when setting focus on same actor
X-Git-Tag: accepted/tizen/common/20170403.185624~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=668f023b25c26351e46c55500da0843b6ded94d0;hp=0356a6b9111bfec065ba1943a4a69839c183d721;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen] Do nothing when setting focus on same actor

This reverts commit c7db626fe12c997353acf3524fd819a1420116e0.

Change-Id: Ie29df40b3f07dd9ac90ef825a45ff25419abf814
---

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 d3e4b88..ef613e7 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -144,6 +144,18 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor )
 {
   bool success = false;
 
+  Actor currentFocusedActor = GetCurrentFocusActor();
+
+  // If developer set focus on same actor, doing nothing
+  if( actor == currentFocusedActor )
+  {
+    if( !actor )
+    {
+      return false;
+    }
+    return true;
+  }
+
   // Check whether the actor is in the stage and is keyboard focusable.
   if( actor && actor.IsKeyboardFocusable() )
   {
@@ -151,9 +163,8 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor )
     {
       actor.Add( GetFocusIndicatorActor() );
     }
-    // Send notification for the change of focus actor
-    Actor currentFocusedActor = GetCurrentFocusActor();
 
+    // Send notification for the change of focus actor
     if( !mFocusChangedSignal.Empty() )
     {
       mFocusChangedSignal.Emit(currentFocusedActor, actor);