From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 8 May 2017 03:51:31 +0000 (+0900)
Subject: Revert "[Tizen] Do nothing when setting focus on same actor"
X-Git-Tag: accepted/tizen/unified/20170510.013038~10
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=922962532d7e587d6d876a483ede15bdc15d70dc

Revert "[Tizen] Do nothing when setting focus on same actor"

This reverts commit 9c051cd8ef4e8b3d2019fd659e24e2d6be2cb85a.

Change-Id: I4e6a477d7d3398fac1077dfe625083d6737ac121
---

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 2ad1502..d58560d 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -143,18 +143,6 @@ 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() )
   {
@@ -162,8 +150,9 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor )
     {
       actor.Add( GetFocusIndicatorActor() );
     }
-
     // Send notification for the change of focus actor
+    Actor currentFocusedActor = GetCurrentFocusActor();
+
     if( !mFocusChangedSignal.Empty() )
     {
       mFocusChangedSignal.Emit(currentFocusedActor, actor);