X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.cpp;h=5092cfef04079845dbfae3de793bb78ab8ca1891;hp=5e447c47072a99017af95706f39674740426ba9e;hb=40c53b53859fb3dcdf265728b3f1af673453bbd0;hpb=8ae521ab64a3922f3419fbbfb83dde57e6135cf5 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 5e447c4..5092cfe 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -22,25 +22,24 @@ #include // for strcmp #include #include -#include -#include +#include #include #include -#include #include -#include +#include #include #include #include -#include -#include #include +#include +#include // INTERNAL INCLUDES +#include #include #include #include -#include +#include #include #include #include @@ -63,7 +62,7 @@ Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_KEY const char* const IS_FOCUS_GROUP_PROPERTY_NAME = "isKeyboardFocusGroup"; // This property will be replaced by a flag in Control. -const char* const FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "keyboard_focus.9.png"; +const char* const FOCUS_BORDER_IMAGE_FILE_NAME = "keyboard_focus.9.png"; BaseHandle Create() { @@ -122,15 +121,16 @@ KeyboardFocusManager::KeyboardFocusManager() mFocusedActorEnterKeySignal(), mCurrentFocusActor(), mFocusIndicatorActor(), - mIsFocusIndicatorShown( -1 ), - mFocusGroupLoopEnabled( false ), - mIsWaitingKeyboardFocusChangeCommit( false ), - mClearFocusOnTouch( true ), - mEnableFocusIndicator( true ), - mAlwaysShowIndicator( true ), mFocusHistory(), mSlotDelegate( this ), - mCustomAlgorithmInterface(NULL) + mCustomAlgorithmInterface(NULL), + mCurrentFocusedWindow(), + mIsFocusIndicatorShown( UNKNOWN ), + mEnableFocusIndicator( ENABLE ), + mAlwaysShowIndicator( ALWAYS_SHOW ), + mFocusGroupLoopEnabled( false ), + mIsWaitingKeyboardFocusChangeCommit( false ), + mClearFocusOnTouch( true ) { // TODO: Get FocusIndicatorEnable constant from stylesheet to set mIsFocusIndicatorShown. @@ -141,23 +141,33 @@ void KeyboardFocusManager::OnAdaptorInit() { if( Adaptor::IsAvailable() ) { - // Retrieve all the existing widnows - Dali::WindowContainer windows = Adaptor::Get().GetWindows(); - for ( auto iter = windows.begin(); iter != windows.end(); ++iter ) + // Retrieve all the existing scene holders + Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders(); + for( auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter ) { - DevelWindow::KeyEventSignal( *iter ).Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent); - DevelWindow::TouchSignal( *iter ).Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch); + ( *iter ).KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent ); + ( *iter ).TouchedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch ); + Dali::Window window = DevelWindow::DownCast( *iter ); + if( window ) + { + window.FocusChangeSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged); + } } - // Get notified when any new window is created afterwards - Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowCreated); + // Get notified when any new scene holder is created afterwards + Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnSceneHolderCreated ); } } -void KeyboardFocusManager::OnWindowCreated( Dali::Window& window ) +void KeyboardFocusManager::OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder ) { - DevelWindow::KeyEventSignal( window ).Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent); - DevelWindow::TouchSignal( window ).Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch); + sceneHolder.KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent ); + sceneHolder.TouchedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch ); + Dali::Window window = DevelWindow::DownCast( sceneHolder ); + if( window ) + { + window.FocusChangeSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnWindowFocusChanged); + } } KeyboardFocusManager::~KeyboardFocusManager() @@ -170,9 +180,9 @@ void KeyboardFocusManager::GetConfigurationFromStyleManger() if( styleManager ) { Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager ); - mAlwaysShowIndicator = config["alwaysShowFocus"].Get(); - mIsFocusIndicatorShown = static_cast(mAlwaysShowIndicator); - mClearFocusOnTouch = mIsFocusIndicatorShown ? false : true; + mAlwaysShowIndicator = config["alwaysShowFocus"].Get() ? ALWAYS_SHOW : NONE; + mIsFocusIndicatorShown = ( mAlwaysShowIndicator == ALWAYS_SHOW )? SHOW : HIDE; + mClearFocusOnTouch = ( mIsFocusIndicatorShown == SHOW ) ? false : true; } } @@ -180,7 +190,7 @@ bool KeyboardFocusManager::SetCurrentFocusActor( Actor actor ) { DALI_ASSERT_DEBUG( !mIsWaitingKeyboardFocusChangeCommit && "Calling this function in the PreFocusChangeSignal callback?" ); - if( mIsFocusIndicatorShown == -1 ) + if( mIsFocusIndicatorShown == UNKNOWN ) { GetConfigurationFromStyleManger(); } @@ -191,6 +201,16 @@ bool KeyboardFocusManager::SetCurrentFocusActor( Actor actor ) bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor ) { bool success = false; + if( actor && actor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) + { + Integration::SceneHolder currentWindow = Integration::SceneHolder::Get( actor ); + + if( currentWindow.GetRootLayer() != mCurrentFocusedWindow.GetHandle()) + { + Layer rootLayer = currentWindow.GetRootLayer(); + mCurrentFocusedWindow = rootLayer; + } + } Actor currentFocusedActor = GetCurrentFocusActor(); @@ -205,9 +225,9 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor ) } // Check whether the actor is in the stage and is keyboard focusable. - if( actor && actor.IsKeyboardFocusable() && actor.OnStage() ) + if( actor && actor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { - if( mIsFocusIndicatorShown && mEnableFocusIndicator ) + if( ( mIsFocusIndicatorShown == SHOW ) && ( mEnableFocusIndicator == ENABLE ) ) { actor.Add( GetFocusIndicatorActor() ); } @@ -231,6 +251,22 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor ) // Save the current focused actor mCurrentFocusActor = actor; + bool focusedWindowFound = false; + for( unsigned int i = 0; i < mCurrentFocusActors.size(); i++ ) + { + if( mCurrentFocusActors[i].first == mCurrentFocusedWindow ) + { + mCurrentFocusActors[i].second = actor; + focusedWindowFound = true; + break; + } + } + if( !focusedWindowFound) + { + // A new window gains the focus, so store the focused actor in that window. + mCurrentFocusActors.push_back( std::pair< WeakHandle< Layer>, WeakHandle< Actor > >( mCurrentFocusedWindow , actor )); + } + Toolkit::Control newlyFocusedControl = Toolkit::Control::DownCast(actor); if( newlyFocusedControl ) { @@ -262,16 +298,39 @@ bool KeyboardFocusManager::DoSetCurrentFocusActor( Actor actor ) Actor KeyboardFocusManager::GetCurrentFocusActor() { Actor actor = mCurrentFocusActor.GetHandle(); - if( actor && ! actor.OnStage() ) + + if( actor && ! actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { // If the actor has been removed from the stage, then it should not be focused - actor.Reset(); mCurrentFocusActor.Reset(); } return actor; } +Actor KeyboardFocusManager::GetFocusActorFromCurrentWindow() +{ + Actor actor; + unsigned int index; + for( index = 0; index < mCurrentFocusActors.size(); index++ ) + { + if( mCurrentFocusActors[index].first == mCurrentFocusedWindow ) + { + actor = mCurrentFocusActors[index].second.GetHandle(); + break; + } + } + + if( actor && ! actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) + { + // If the actor has been removed from the window, then the window doesn't have any focused actor + actor.Reset(); + mCurrentFocusActors.erase( mCurrentFocusActors.begin() + index ); + } + + return actor; +} + Actor KeyboardFocusManager::GetCurrentFocusGroup() { return GetFocusGroup(GetCurrentFocusActor()); @@ -292,7 +351,7 @@ void KeyboardFocusManager::MoveFocusBackward() Actor target = mFocusHistory[ mFocusHistory.size() -1 ].GetHandle(); // Impl of Actor is not null - if( target && target.OnStage() ) + if( target && target.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { // Delete pre focused actor in history because it will pushed again by SetCurrentFocusActor() mFocusHistory.pop_back(); @@ -328,7 +387,12 @@ Toolkit::Control KeyboardFocusManager::GetParentLayoutControl(Actor actor) const Actor parent; if(actor) { - rootActor = DevelWindow::Get( actor ).GetRootLayer(); + Integration::SceneHolder window = Integration::SceneHolder::Get( actor ); + if ( window ) + { + rootActor = window.GetRootLayer(); + } + parent = actor.GetParent(); } @@ -410,7 +474,11 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction if( !nextFocusableActor ) { - nextFocusableActor = DevelWindow::Get( currentFocusActor ).GetRootLayer().FindChildById( actorId ); + Integration::SceneHolder window = Integration::SceneHolder::Get( currentFocusActor ); + if ( window ) + { + nextFocusableActor = window.GetRootLayer().FindChildById( actorId ); + } } } } @@ -434,7 +502,7 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction } } - if( nextFocusableActor && nextFocusableActor.IsKeyboardFocusable() ) + if( nextFocusableActor && nextFocusableActor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE ) ) { // Whether the next focusable actor is a layout control if( IsLayoutControl( nextFocusableActor ) ) @@ -460,7 +528,7 @@ bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr Actor nextFocusableActor = GetImplementation( control ).GetNextKeyboardFocusableActor(actor, direction, mFocusGroupLoopEnabled); if(nextFocusableActor) { - if(!nextFocusableActor.IsKeyboardFocusable()) + if(!nextFocusableActor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE )) { // If the actor is not focusable, ask the same layout control for the next actor to focus return DoMoveFocusWithinLayoutControl(control, nextFocusableActor, direction); @@ -479,7 +547,7 @@ bool KeyboardFocusManager::DoMoveFocusWithinLayoutControl(Toolkit::Control contr mIsWaitingKeyboardFocusChangeCommit = false; } - if (committedFocusActor && committedFocusActor.IsKeyboardFocusable()) + if (committedFocusActor && committedFocusActor.GetProperty< bool >( Actor::Property::KEYBOARD_FOCUSABLE )) { // Whether the commited focusable actor is a layout control if(IsLayoutControl(committedFocusActor)) @@ -584,7 +652,7 @@ void KeyboardFocusManager::ClearFocus() } mCurrentFocusActor.Reset(); - mIsFocusIndicatorShown = static_cast(mAlwaysShowIndicator); + mIsFocusIndicatorShown = ( mAlwaysShowIndicator == ALWAYS_SHOW ) ? SHOW : HIDE; } void KeyboardFocusManager::SetFocusGroupLoop(bool enabled) @@ -662,15 +730,16 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor() if( ! mFocusIndicatorActor ) { // Create the default if it hasn't been set and one that's shared by all the keyboard focusable actors - mFocusIndicatorActor = Toolkit::ImageView::New( FOCUS_BORDER_IMAGE_PATH ); + const std::string imageDirPath = AssetManager::GetDaliImagePath(); + mFocusIndicatorActor = Toolkit::ImageView::New( imageDirPath + FOCUS_BORDER_IMAGE_FILE_NAME ); // Apply size constraint to the focus indicator mFocusIndicatorActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); } - mFocusIndicatorActor.SetParentOrigin( ParentOrigin::CENTER ); - mFocusIndicatorActor.SetAnchorPoint( AnchorPoint::CENTER ); - mFocusIndicatorActor.SetPosition(0.0f, 0.0f); + mFocusIndicatorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mFocusIndicatorActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mFocusIndicatorActor.SetProperty( Actor::Property::POSITION, Vector2(0.0f, 0.0f)); return mFocusIndicatorActor; } @@ -682,25 +751,25 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) Toolkit::AccessibilityManager accessibilityManager = Toolkit::AccessibilityManager::Get(); - std::string keyName = event.keyPressedName; + std::string keyName = event.GetKeyName(); - if( mIsFocusIndicatorShown == -1 ) + if( mIsFocusIndicatorShown == UNKNOWN ) { GetConfigurationFromStyleManger(); } bool isFocusStartableKey = false; - if(event.state == KeyEvent::Down) + if(event.GetState() == KeyEvent::DOWN) { if (keyName == "Left") { if(!isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if(mIsFocusIndicatorShown == HIDE) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -720,10 +789,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) { if(!isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -741,10 +810,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "Up" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -756,10 +825,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "Down" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -771,10 +840,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "Prior" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -786,10 +855,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "Next" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -801,10 +870,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "Tab" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -817,10 +886,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } else if (keyName == "space" && !isAccessibilityEnabled) { - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } isFocusStartableKey = true; @@ -828,10 +897,10 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) else if (keyName == "" && !isAccessibilityEnabled) { // Check the fake key event for evas-plugin case - if(!mIsFocusIndicatorShown) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } isFocusStartableKey = true; @@ -844,14 +913,14 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) { } } - else if(event.state == KeyEvent::Up) + else if(event.GetState() == KeyEvent::UP) { if (keyName == "Return") { - if(!mIsFocusIndicatorShown && !isAccessibilityEnabled) + if((mIsFocusIndicatorShown == HIDE) && !isAccessibilityEnabled) { // Show focus indicator - mIsFocusIndicatorShown = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -876,12 +945,12 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } } - if(isFocusStartableKey && mIsFocusIndicatorShown && !isAccessibilityEnabled) + if(isFocusStartableKey && ( mIsFocusIndicatorShown == SHOW ) && !isAccessibilityEnabled) { Actor actor = GetCurrentFocusActor(); if( actor ) { - if( mEnableFocusIndicator ) + if( mEnableFocusIndicator == ENABLE ) { // Make sure the focused actor is highlighted actor.Add( GetFocusIndicatorActor() ); @@ -896,11 +965,11 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } } -void KeyboardFocusManager::OnTouch(const TouchData& touch) +void KeyboardFocusManager::OnTouch(const TouchEvent& touch) { - // if mIsFocusIndicatorShown is -1, it means Configuration is not loaded. + // if mIsFocusIndicatorShown is UNKNOWN, it means Configuration is not loaded. // Try to load configuration. - if( mIsFocusIndicatorShown == -1 ) + if( mIsFocusIndicatorShown == UNKNOWN ) { GetConfigurationFromStyleManger(); } @@ -914,6 +983,27 @@ void KeyboardFocusManager::OnTouch(const TouchData& touch) } } +void KeyboardFocusManager::OnWindowFocusChanged(Window window, bool focusIn ) +{ + if( focusIn && mCurrentFocusedWindow.GetHandle() != window.GetRootLayer() ) + { + // Change Current Focused Window + Layer rootLayer = window.GetRootLayer(); + mCurrentFocusedWindow = rootLayer; + + // Get Current Focused Actor from window + Actor currentFocusedActor = GetFocusActorFromCurrentWindow(); + SetCurrentFocusActor( currentFocusedActor ); + + if( currentFocusedActor && ( mEnableFocusIndicator == ENABLE ) ) + { + // Make sure the focused actor is highlighted + currentFocusedActor.Add( GetFocusIndicatorActor() ); + mIsFocusIndicatorShown = SHOW; + } + } +} + Toolkit::KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal() { return mPreFocusChangeSignal; @@ -978,12 +1068,13 @@ void KeyboardFocusManager::EnableFocusIndicator(bool enable) mFocusIndicatorActor.Unparent(); } - mEnableFocusIndicator = enable; + mEnableFocusIndicator = enable? ENABLE : DISABLE; + } bool KeyboardFocusManager::IsFocusIndicatorEnabled() const { - return mEnableFocusIndicator; + return ( mEnableFocusIndicator == ENABLE ); } } // namespace Internal