Remove unnecessary ClearFocus().

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / focus-manager / keyboard-focus-manager-impl.cpp

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 380da05..f5d8d03 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -1014,24 +1014,17 @@ void KeyboardFocusManager::OnTouch(const TouchEvent& touch)
     {
       return;
     }
+    // If mClearFocusOnTouch is false, do not clear the focus indicator even if user touch the screen.
+    if(mClearFocusOnTouch)
+    {
+      ClearFocusIndicator();
+    }
+
     // If KEYBOARD_FOCUSABLE and TOUCH_FOCUSABLE is true, set focus actor
     if(hitActor && hitActor.GetProperty<bool>(Actor::Property::KEYBOARD_FOCUSABLE) && hitActor.GetProperty<bool>(DevelActor::Property::TOUCH_FOCUSABLE))
     {
-      // If mClearFocusOnTouch is false, do not clear the focus
-      if(mClearFocusOnTouch)
-      {
-        ClearFocus();
-      }
       SetCurrentFocusActor(hitActor);
     }
-    else
-    {
-      // If mClearFocusOnTouch is false, do not clear the focus indicator even if user touch the screen.
-      if(mClearFocusOnTouch)
-      {
-        ClearFocusIndicator();
-      }
-    }
   }
 }