X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.cpp;h=707aa688abd1f6b393701a2b4d4cb7f1e25f0040;hb=HEAD;hp=c65abbb2e66460cf5b8356ac4b8d47860ee04629;hpb=1ca353dc14d04ecc3a36ece4669bfffe35ff4984;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 c65abbb..e8a990f 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -130,7 +130,8 @@ KeyboardFocusManager::KeyboardFocusManager() mFocusGroupLoopEnabled(false), mIsWaitingKeyboardFocusChangeCommit(false), mClearFocusOnTouch(true), - mEnableDefaultAlgorithm(false) + mEnableDefaultAlgorithm(false), + mCurrentWindowId(0) { // TODO: Get FocusIndicatorEnable constant from stylesheet to set mIsFocusIndicatorShown. @@ -149,7 +150,7 @@ void KeyboardFocusManager::OnAdaptorInit() (*iter).TouchedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnTouch); (*iter).WheelEventGeneratedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnCustomWheelEvent); (*iter).WheelEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWheelEvent); - Dali::Window window = DevelWindow::DownCast(*iter); + Window window = Window::DownCast(*iter); if(window) { window.FocusChangeSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged); @@ -167,7 +168,7 @@ void KeyboardFocusManager::OnSceneHolderCreated(Dali::Integration::SceneHolder& sceneHolder.TouchedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnTouch); sceneHolder.WheelEventGeneratedSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnCustomWheelEvent); sceneHolder.WheelEventSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWheelEvent); - Dali::Window window = DevelWindow::DownCast(sceneHolder); + Window window = Window::DownCast(sceneHolder); if(window) { window.FocusChangeSignal().Connect(mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged); @@ -183,8 +184,9 @@ void KeyboardFocusManager::GetConfigurationFromStyleManger() Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); if(styleManager) { - Property::Map config = Toolkit::DevelStyleManager::GetConfigurations(styleManager); - mAlwaysShowIndicator = config["alwaysShowFocus"].Get() ? ALWAYS_SHOW : NONE; + const auto alwaysShowFocusValue = Toolkit::DevelStyleManager::GetConfigurations(styleManager).Find("alwaysShowFocus", Property::Type::BOOLEAN); + + mAlwaysShowIndicator = (alwaysShowFocusValue && alwaysShowFocusValue->Get()) ? ALWAYS_SHOW : NONE; mIsFocusIndicatorShown = (mAlwaysShowIndicator == ALWAYS_SHOW) ? SHOW : HIDE; mClearFocusOnTouch = (mIsFocusIndicatorShown == SHOW) ? false : true; } @@ -210,8 +212,7 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) if(actor && actor.GetProperty(Actor::Property::KEYBOARD_FOCUSABLE) && actor.GetProperty(DevelActor::Property::USER_INTERACTION_ENABLED) && - actor.GetProperty(Actor::Property::CONNECTED_TO_SCENE) && - actor.GetProperty(Actor::Property::VISIBLE)) + actor.GetProperty(Actor::Property::CONNECTED_TO_SCENE)) { // If the parent's KEYBOARD_FOCUSABLE_CHILDREN is false, it cannot have focus. Actor parent = actor.GetParent(); @@ -219,7 +220,7 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) { if(!parent.GetProperty(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN)) { - DALI_LOG_INFO(gLogFilter, Debug::General, "[%s:%d] Parent Actor has KEYBOARD_FOCUSABLE_CHILDREN false\n", __FUNCTION__, __LINE__); + DALI_LOG_DEBUG_INFO("Parent Actor has KEYBOARD_FOCUSABLE_CHILDREN false\n"); return false; } parent = parent.GetParent(); @@ -227,6 +228,7 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) // If developer set focus on same actor, doing nothing Actor currentFocusedActor = GetCurrentFocusActor(); + DALI_LOG_DEBUG_INFO("current focused actor : [%p] new focused actor : [%p]\n", currentFocusedActor.GetObjectPtr(), actor.GetObjectPtr()); if(actor == currentFocusedActor) { return true; @@ -237,6 +239,7 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) { Layer rootLayer = currentWindow.GetRootLayer(); mCurrentFocusedWindow = rootLayer; + mCurrentWindowId = static_cast(currentWindow.GetNativeId()); } if((mIsFocusIndicatorShown == SHOW) && (mEnableFocusIndicator == ENABLE)) @@ -244,14 +247,6 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) actor.Add(GetFocusIndicatorActor()); } - Toolkit::Control currentlyFocusedControl = Toolkit::Control::DownCast(currentFocusedActor); - if(currentlyFocusedControl) - { - // Do we need it to remember if it was previously DISABLED? - currentlyFocusedControl.SetProperty(DevelControl::Property::STATE, DevelControl::NORMAL); - currentlyFocusedControl.ClearKeyInputFocus(); - } - // Save the current focused actor mCurrentFocusActor = actor; @@ -271,6 +266,20 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) mCurrentFocusActors.push_back(std::pair, WeakHandle >(mCurrentFocusedWindow, actor)); } + // Send notification for the change of focus actor + if(!mFocusChangedSignal.Empty()) + { + mFocusChangedSignal.Emit(currentFocusedActor, actor); + } + + Toolkit::Control currentlyFocusedControl = Toolkit::Control::DownCast(currentFocusedActor); + if(currentlyFocusedControl) + { + // Do we need it to remember if it was previously DISABLED? + currentlyFocusedControl.SetProperty(DevelControl::Property::STATE, DevelControl::NORMAL); + currentlyFocusedControl.ClearKeyInputFocus(); + } + Toolkit::Control newlyFocusedControl = Toolkit::Control::DownCast(actor); if(newlyFocusedControl) { @@ -288,11 +297,6 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor(Actor actor) mFocusHistory.erase(beginPos); } - // Send notification for the change of focus actor - if(!mFocusChangedSignal.Empty()) - { - mFocusChangedSignal.Emit(currentFocusedActor, actor); - } DALI_LOG_INFO(gLogFilter, Debug::General, "[%s:%d] SUCCEED\n", __FUNCTION__, __LINE__); success = true; } @@ -519,16 +523,16 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction nextFocusableActor = mPreFocusChangeSignal.Emit(currentFocusActor, Actor(), direction); mIsWaitingKeyboardFocusChangeCommit = false; } - else if (mEnableDefaultAlgorithm) + else if(mEnableDefaultAlgorithm) { Actor rootActor = mFocusFinderRootActor.GetHandle(); if(!rootActor) { - if (currentFocusActor) + if(currentFocusActor) { // Find the window of the focused actor. Integration::SceneHolder window = Integration::SceneHolder::Get(currentFocusActor); - if (window) + if(window) { rootActor = window.GetRootLayer(); } @@ -678,6 +682,7 @@ void KeyboardFocusManager::ClearFocus() Actor actor = GetCurrentFocusActor(); if(actor) { + DALI_LOG_RELEASE_INFO("ClearFocus id:(%d)\n", actor.GetProperty(Dali::Actor::Property::ID)); // Send notification for the change of focus actor if(!mFocusChangedSignal.Empty()) { @@ -796,9 +801,25 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor() return mFocusIndicatorActor; } +uint32_t KeyboardFocusManager::GetCurrentWindowId() const +{ + return mCurrentWindowId; +} + void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) { - const std::string& keyName = event.GetKeyName(); + if(mCurrentFocusedWindow.GetHandle()) + { + // If it is a key event that occurred in another window, it returns. + uint32_t eventWindowId = event.GetWindowId(); + if(eventWindowId > 0 && GetCurrentWindowId() != eventWindowId) + { + DALI_LOG_RELEASE_INFO("CurrentFocusedWindow id %d, window ID where key event occurred %d : key event skip\n", GetCurrentWindowId(), eventWindowId); + return; + } + } + + const std::string& keyName = event.GetKeyName(); const std::string& deviceName = event.GetDeviceName(); if(mIsFocusIndicatorShown == UNKNOWN) @@ -983,7 +1004,7 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) actor.Add(GetFocusIndicatorActor()); } } - else + else if(!mEnableDefaultAlgorithm) { // No actor is focused but keyboard focus is activated by the key press // Let's try to move the initial focus @@ -1011,24 +1032,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(); - } - } } } @@ -1044,8 +1058,8 @@ void KeyboardFocusManager::OnWheelEvent(const WheelEvent& event) bool KeyboardFocusManager::OnCustomWheelEvent(const WheelEvent& event) { - bool consumed = false; - Actor actor = GetCurrentFocusActor(); + bool consumed = false; + Actor actor = GetCurrentFocusActor(); if(actor) { // Notify the actor about the wheel event @@ -1092,16 +1106,20 @@ void KeyboardFocusManager::OnWindowFocusChanged(Window window, bool focusIn) // Change Current Focused Window Layer rootLayer = window.GetRootLayer(); mCurrentFocusedWindow = rootLayer; + mCurrentWindowId = static_cast(Integration::SceneHolder::Get(rootLayer).GetNativeId()); // Get Current Focused Actor from window Actor currentFocusedActor = GetFocusActorFromCurrentWindow(); - SetCurrentFocusActor(currentFocusedActor); - - if(currentFocusedActor && (mEnableFocusIndicator == ENABLE)) + if(currentFocusedActor) { - // Make sure the focused actor is highlighted - currentFocusedActor.Add(GetFocusIndicatorActor()); - mIsFocusIndicatorShown = SHOW; + SetCurrentFocusActor(currentFocusedActor); + + if(mEnableFocusIndicator == ENABLE) + { + // Make sure the focused actor is highlighted + currentFocusedActor.Add(GetFocusIndicatorActor()); + mIsFocusIndicatorShown = SHOW; + } } } }