From: Jinho, Lee <jeano.lee@samsung.com>
Date: Mon, 17 Apr 2017 04:21:12 +0000 (+0900)
Subject: [Tizen] Do nothing when setting focus on same actor
X-Git-Tag: submit/tizen/20170417.100748~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=798e48ef0f8b91a99e458707f19f7cc915ead37f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen] Do nothing when setting focus on same actor

This reverts commit a34b00c9733bbd285e4e1a362b2b5017386ca557.

Change-Id: Ib93e5fa08be1184f305cc634239f69eec3924143
---

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 d58560d635..2ad1502a00 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -143,6 +143,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() )
   {
@@ -150,9 +162,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);