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=04c15c44e67a99999283e9d3444c2d2b4fba8019;hp=9e3498462ea2115a5c6f3b374e7e8f3e158ff976;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=f7e78caead4596a66b750444e77343856432d36d 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 9e34984..04c15c4 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) 2017 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. @@ -21,26 +21,27 @@ // EXTERNAL INCLUDES #include // for strcmp #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 namespace Dali { @@ -60,7 +61,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() { @@ -119,17 +120,53 @@ KeyboardFocusManager::KeyboardFocusManager() mFocusedActorEnterKeySignal(), mCurrentFocusActor(), mFocusIndicatorActor(), - mIsFocusIndicatorEnabled( -1 ), - mFocusGroupLoopEnabled( false ), - mIsWaitingKeyboardFocusChangeCommit( false ), - mClearFocusOnTouch( 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. + + LifecycleController::Get().InitSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnAdaptorInit ); +} + +void KeyboardFocusManager::OnAdaptorInit() { - // TODO: Get FocusIndicatorEnable constant from stylesheet to set mIsFocusIndicatorEnabled. - Stage::GetCurrent().KeyEventSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnKeyEvent); - Stage::GetCurrent().TouchSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnTouch ); + if( Adaptor::IsAvailable() ) + { + // Retrieve all the existing scene holders + Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders(); + for( auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter ) + { + ( *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 scene holder is created afterwards + Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyboardFocusManager::OnSceneHolderCreated ); + } +} + +void KeyboardFocusManager::OnSceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder ) +{ + 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() @@ -142,8 +179,9 @@ void KeyboardFocusManager::GetConfigurationFromStyleManger() if( styleManager ) { Property::Map config = Toolkit::DevelStyleManager::GetConfigurations( styleManager ); - mIsFocusIndicatorEnabled = static_cast(config["alwaysShowFocus"].Get()); - mClearFocusOnTouch = mIsFocusIndicatorEnabled ? false : true; + mAlwaysShowIndicator = config["alwaysShowFocus"].Get() ? ALWAYS_SHOW : NONE; + mIsFocusIndicatorShown = ( mAlwaysShowIndicator == ALWAYS_SHOW )? SHOW : HIDE; + mClearFocusOnTouch = ( mIsFocusIndicatorShown == SHOW ) ? false : true; } } @@ -151,7 +189,7 @@ bool KeyboardFocusManager::SetCurrentFocusActor( Actor actor ) { DALI_ASSERT_DEBUG( !mIsWaitingKeyboardFocusChangeCommit && "Calling this function in the PreFocusChangeSignal callback?" ); - if( mIsFocusIndicatorEnabled == -1 ) + if( mIsFocusIndicatorShown == UNKNOWN ) { GetConfigurationFromStyleManger(); } @@ -162,6 +200,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(); @@ -176,9 +224,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( mIsFocusIndicatorEnabled ) + if( ( mIsFocusIndicatorShown == SHOW ) && ( mEnableFocusIndicator == ENABLE ) ) { actor.Add( GetFocusIndicatorActor() ); } @@ -202,6 +250,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 ) { @@ -233,16 +297,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()); @@ -263,7 +350,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(); @@ -295,10 +382,16 @@ bool KeyboardFocusManager::IsLayoutControl(Actor actor) const Toolkit::Control KeyboardFocusManager::GetParentLayoutControl(Actor actor) const { // Get the actor's parent layout control that supports two dimensional keyboard navigation - Actor rootActor = Stage::GetCurrent().GetRootLayer(); + Actor rootActor; Actor parent; if(actor) { + Integration::SceneHolder window = Integration::SceneHolder::Get( actor ); + if ( window ) + { + rootActor = window.GetRootLayer(); + } + parent = actor.GetParent(); } @@ -380,7 +473,11 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction if( !nextFocusableActor ) { - nextFocusableActor = Stage::GetCurrent().GetRootLayer().FindChildById( actorId ); + Integration::SceneHolder window = Integration::SceneHolder::Get( currentFocusActor ); + if ( window ) + { + nextFocusableActor = window.GetRootLayer().FindChildById( actorId ); + } } } } @@ -404,7 +501,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 ) ) @@ -430,7 +527,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); @@ -449,7 +546,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)) @@ -554,7 +651,7 @@ void KeyboardFocusManager::ClearFocus() } mCurrentFocusActor.Reset(); - mIsFocusIndicatorEnabled = 0; + mIsFocusIndicatorShown = ( mAlwaysShowIndicator == ALWAYS_SHOW ) ? SHOW : HIDE; } void KeyboardFocusManager::SetFocusGroupLoop(bool enabled) @@ -632,134 +729,147 @@ 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; } void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) { - AccessibilityAdaptor accessibilityAdaptor = AccessibilityAdaptor::Get(); - bool isAccessibilityEnabled = accessibilityAdaptor.IsEnabled(); + std::string keyName = event.GetKeyName(); - Toolkit::AccessibilityManager accessibilityManager = Toolkit::AccessibilityManager::Get(); - - std::string keyName = event.keyPressedName; - - if( mIsFocusIndicatorEnabled == -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(!mIsFocusIndicatorEnabled) + if(mIsFocusIndicatorShown == HIDE) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards left + MoveFocus(Toolkit::Control::KeyboardFocus::LEFT); } - // Move the focus towards left - MoveFocus(Toolkit::Control::KeyboardFocus::LEFT); isFocusStartableKey = true; } else { - // Move the accessibility focus backward - accessibilityManager.MoveFocusBackward(); + // Move the focus towards left + MoveFocus(Toolkit::Control::KeyboardFocus::LEFT); } + + isFocusStartableKey = true; } else if (keyName == "Right") { - if(!isAccessibilityEnabled) + if(!mIsFocusIndicatorShown) { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards right + MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT); } - - // Move the focus towards right - MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT); } else { - // Move the accessibility focus forward - accessibilityManager.MoveFocusForward(); + // Move the focus towards right + MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT); } isFocusStartableKey = true; } - else if (keyName == "Up" && !isAccessibilityEnabled) + else if (keyName == "Up") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards up + MoveFocus(Toolkit::Control::KeyboardFocus::UP); } - // Move the focus towards up - MoveFocus(Toolkit::Control::KeyboardFocus::UP); isFocusStartableKey = true; } - else if (keyName == "Down" && !isAccessibilityEnabled) + else if (keyName == "Down") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards down + MoveFocus(Toolkit::Control::KeyboardFocus::DOWN); } - // Move the focus towards down - MoveFocus(Toolkit::Control::KeyboardFocus::DOWN); isFocusStartableKey = true; } - else if (keyName == "Prior" && !isAccessibilityEnabled) + else if (keyName == "Prior") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards the previous page + MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_UP); } - - // Move the focus towards the previous page - MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_UP); isFocusStartableKey = true; } - else if (keyName == "Next" && !isAccessibilityEnabled) + else if (keyName == "Next") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; + } + else + { + // Move the focus towards the next page + MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_DOWN); } - - // Move the focus towards the next page - MoveFocus(Toolkit::Control::KeyboardFocus::PAGE_DOWN); isFocusStartableKey = true; } - else if (keyName == "Tab" && !isAccessibilityEnabled) + else if (keyName == "Tab") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; } else { @@ -770,57 +880,48 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) isFocusStartableKey = true; } - else if (keyName == "space" && !isAccessibilityEnabled) + else if (keyName == "space") { - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; } isFocusStartableKey = true; } - else if (keyName == "" && !isAccessibilityEnabled) + else if (keyName == "") { // Check the fake key event for evas-plugin case - if(!mIsFocusIndicatorEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; } isFocusStartableKey = true; } - else if (keyName == "Backspace" && !isAccessibilityEnabled) + else if (keyName == "Backspace") { // Emit signal to go back to the previous view??? } - else if (keyName == "Escape" && !isAccessibilityEnabled) + else if (keyName == "Escape") { } } - else if(event.state == KeyEvent::Up) + else if(event.GetState() == KeyEvent::UP) { if (keyName == "Return") { - if(!mIsFocusIndicatorEnabled && !isAccessibilityEnabled) + if( mIsFocusIndicatorShown == HIDE ) { // Show focus indicator - mIsFocusIndicatorEnabled = 1; + mIsFocusIndicatorShown = SHOW; } else { // The focused actor has enter pressed on it - Actor actor; - if( !isAccessibilityEnabled ) - { - actor = GetCurrentFocusActor(); - } - else - { - actor = accessibilityManager.GetCurrentFocusActor(); - } - + Actor actor = GetCurrentFocusActor(); if( actor ) { DoKeyboardEnter( actor ); @@ -831,13 +932,16 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) } } - if(isFocusStartableKey && mIsFocusIndicatorEnabled && !isAccessibilityEnabled) + if( isFocusStartableKey && mIsFocusIndicatorShown == SHOW ) { Actor actor = GetCurrentFocusActor(); if( actor ) { - // Make sure the focused actor is highlighted - actor.Add( GetFocusIndicatorActor() ); + if( mEnableFocusIndicator == ENABLE ) + { + // Make sure the focused actor is highlighted + actor.Add( GetFocusIndicatorActor() ); + } } else { @@ -845,14 +949,15 @@ void KeyboardFocusManager::OnKeyEvent(const KeyEvent& event) // Let's try to move the initial focus MoveFocus(Toolkit::Control::KeyboardFocus::RIGHT); } + } } -void KeyboardFocusManager::OnTouch(const TouchData& touch) +void KeyboardFocusManager::OnTouch(const TouchEvent& touch) { - // if mIsFocusIndicatorEnabled is -1, it means Configuration is not loaded. + // if mIsFocusIndicatorShown is UNKNOWN, it means Configuration is not loaded. // Try to load configuration. - if( mIsFocusIndicatorEnabled == -1 ) + if( mIsFocusIndicatorShown == UNKNOWN ) { GetConfigurationFromStyleManger(); } @@ -866,6 +971,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; @@ -923,6 +1049,22 @@ void KeyboardFocusManager::SetCustomAlgorithm(CustomAlgorithmInterface& interfac mCustomAlgorithmInterface = &interface; } +void KeyboardFocusManager::EnableFocusIndicator(bool enable) +{ + if( !enable && mFocusIndicatorActor ) + { + mFocusIndicatorActor.Unparent(); + } + + mEnableFocusIndicator = enable? ENABLE : DISABLE; + +} + +bool KeyboardFocusManager::IsFocusIndicatorEnabled() const +{ + return ( mEnableFocusIndicator == ENABLE ); +} + } // namespace Internal } // namespace Toolkit