From cb7c744139c8447e04c010352e3b3df0c66e71b5 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Wed, 10 May 2023 11:25:46 +0900 Subject: [PATCH] Remove unnecessary ClearFocus(). Inside SetCurrentFocusActor() is doing the same thing as ClearFocus. Change-Id: I8116d653e430a1ff2cb46bbc818c448b07bc1644 --- .../focus-manager/keyboard-focus-manager-impl.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) 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 --- 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(Actor::Property::KEYBOARD_FOCUSABLE) && hitActor.GetProperty(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(); - } - } } } -- 2.7.4