X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=de3528933a1f6a2018a73fe30a6f97983e5469a2;hp=7a84f4e9f299f9e574f422e109532257ba1a8d97;hb=e9d852fcdacc5788785bfe0b617bd757794e8208;hpb=af4073fd7a4f946e26110ecd608ef8e748c078aa diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 7a84f4e..de35289 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -36,7 +36,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include #include @@ -305,7 +305,7 @@ void Popup::OnInitialize() mPopupLayout = Toolkit::TableView::New( 3, 1 ); // Adds the default background image. - SetPopupBackgroundImage( ImageActor::New( ResourceImage::New( DEFAULT_BACKGROUND_IMAGE_PATH ) ) ); + SetPopupBackgroundImage( Toolkit::ImageView::New( ResourceImage::New( DEFAULT_BACKGROUND_IMAGE_PATH ) ) ); mPopupLayout.SetName( "popupLayoutTable" ); mPopupLayout.SetParentOrigin( ParentOrigin::CENTER ); @@ -325,8 +325,6 @@ void Popup::OnInitialize() // Any content after this point which is added to Self() will be re-parented to mContent. mAlterAddedChild = true; - // Make self keyboard focusable and a focus group. - self.SetKeyboardFocusable( true ); SetAsKeyboardFocusGroup( true ); } @@ -718,7 +716,6 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) // Allow the popup to catch events. mPopupLayout.SetSensitive( true ); - SetKeyInputFocus(); // Handle the keyboard focus when popup is shown. Dali::Toolkit::KeyboardFocusManager keyboardFocusManager = Dali::Toolkit::KeyboardFocusManager::Get(); @@ -726,14 +723,30 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) { mPreviousFocusedActor = keyboardFocusManager.GetCurrentFocusActor(); - if( mContent && mContent.IsKeyboardFocusable() ) + if( Self().IsKeyboardFocusable() ) { - // If content is focusable, move the focus to content. - keyboardFocusManager.SetCurrentFocusActor( mContent ); - } - else - { - DALI_LOG_WARNING( "There is no focusable in popup\n" ); + // Setup the actgor to start focus from. + Actor focusActor; + if( mContent && mContent.IsKeyboardFocusable() ) + { + // If the content is focusable, move the focus to the content. + focusActor = mContent; + } + else if( mFooter && mFooter.IsKeyboardFocusable() ) + { + // If the footer is focusable, move the focus to the footer. + focusActor = mFooter; + } + else + { + DALI_LOG_WARNING( "There is no focusable in popup\n" ); + } + + if( focusActor ) + { + SetKeyInputFocus(); + keyboardFocusManager.SetCurrentFocusActor( focusActor ); + } } } } @@ -849,7 +862,7 @@ void Popup::LayoutTail() { // Adds the tail actor. Image tail = ResourceImage::New( image ); - mTailImage = ImageActor::New( tail ); + mTailImage = Toolkit::ImageView::New( tail ); mTailImage.SetName( "tailImage" ); const Vector3 anchorPoint = AnchorPoint::BOTTOM_RIGHT - position; mTailImage.SetParentOrigin( position ); @@ -877,7 +890,7 @@ Toolkit::Control Popup::CreateBacking() backing.SetName( "popupBacking" ); // Must always be positioned top-left of stage, regardless of parent. - backing.SetPositionInheritanceMode( DONT_INHERIT_POSITION ); + backing.SetInheritPosition(false); backing.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Always the full size of the stage. @@ -1227,7 +1240,7 @@ void Popup::SetProperty( BaseObject* object, Property::Index propertyIndex, cons Image image = ResourceImage::New( valueString ); if( image ) { - ImageActor actor = ImageActor::New( image ); + Toolkit::ImageView actor = Toolkit::ImageView::New( image ); popupImpl.SetPopupBackgroundImage( actor ); } } @@ -1493,14 +1506,18 @@ bool Popup::OnDialogTouched(Actor actor, const TouchEvent& event) return true; } -void Popup::OnControlStageConnection() +void Popup::OnStageConnection( int depth ) { + Control::OnStageConnection( depth ); + mLayoutDirty = true; RelayoutRequest(); } -void Popup::OnControlChildAdd( Actor& child ) +void Popup::OnChildAdd( Actor& child ) { + Control::OnChildAdd( child ); + // Re-parent any children added by user to the body layer. if( mAlterAddedChild ) { @@ -1731,114 +1748,145 @@ bool Popup::OnKeyEvent( const KeyEvent& event ) return consumed; } +void Popup::AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors ) +{ + if( parent ) + { + Toolkit::Control control = Toolkit::Control::DownCast( parent ); + bool layoutControl = control && GetImplementation( control ).IsKeyboardNavigationSupported(); + + if( parent.IsKeyboardFocusable() || layoutControl ) + { + focusableActors.push_back( parent ); + + if( !layoutControl ) + { + for( unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i ) + { + Actor child( parent.GetChildAt( i ) ); + AddFocusableChildrenRecursive( child, focusableActors ); + } + } + } + } +} + +void Popup::AddFocusableChildren( Actor parent, std::vector< Actor >& focusableActors ) +{ + if( parent ) + { + Toolkit::Control control = Toolkit::Control::DownCast( parent ); + if( !GetImplementation( control ).IsKeyboardNavigationSupported() ) + { + for( unsigned int i = 0, numberChildren = parent.GetChildCount(); i < numberChildren; ++i ) + { + Actor child( parent.GetChildAt( i ) ); + AddFocusableChildrenRecursive( child, focusableActors ); + } + } + else + { + focusableActors.push_back( parent ); + } + } +} + Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled ) { + std::string currentStr; + if( currentFocusedActor ) + { + currentStr = currentFocusedActor.GetName(); + } + Actor nextFocusableActor( currentFocusedActor ); + Actor currentFocusGroup; + if( currentFocusedActor ) + { + currentFocusGroup = KeyboardFocusManager::Get().GetFocusGroup( currentFocusedActor ); + } // TODO: Needs to be optimised - if( !currentFocusedActor || ( currentFocusedActor && KeyboardFocusManager::Get().GetFocusGroup( currentFocusedActor ) != Self() ) ) + // The following statement checks that if we have a current focused actor, then the current focus group is not the popup content or footer. + // This is to detect if the focus is currently outside the popup, and if so, move it inside. + if( !currentFocusedActor || + ( currentFocusedActor && ( ( !mContent || ( currentFocusGroup != mContent ) ) && ( !mFooter || ( currentFocusGroup != mFooter ) ) ) ) ) { - // The current focused actor is not within popup + // The current focused actor is not within popup. if( mContent && mContent.IsKeyboardFocusable() ) { - // If content is focusable, move the focus to content + // If the content is focusable, move the focus to the content. nextFocusableActor = mContent; } + else if( mFooter && mFooter.IsKeyboardFocusable() ) + { + // If the footer is focusable, move the focus to the footer. + nextFocusableActor = mFooter; + } } else { // Rebuild the focus chain because controls or content can be added or removed dynamically std::vector< Actor > focusableActors; - if( mContent && mContent.IsKeyboardFocusable() ) + + AddFocusableChildren( mContent, focusableActors ); + AddFocusableChildren( mFooter, focusableActors ); + + std::vector< Actor >::iterator endIterator = focusableActors.end(); + std::vector< Actor >::iterator currentIterator = focusableActors.begin(); + for( std::vector< Actor >::iterator iterator = focusableActors.begin(); iterator != endIterator; ++iterator ) { - focusableActors.push_back( mContent ); + if( currentFocusedActor == *iterator ) + { + currentIterator = iterator; + } } - for( std::vector< Actor >::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter ) + if( currentIterator != endIterator ) { - if( currentFocusedActor == *iter ) + switch( direction ) { - switch( direction ) + case Toolkit::Control::KeyboardFocus::LEFT: { - case Toolkit::Control::KeyboardFocus::LEFT: + if( currentIterator == focusableActors.begin() ) { - if( iter == focusableActors.begin() ) - { - nextFocusableActor = *( focusableActors.end() - 1 ); - } - else - { - nextFocusableActor = *( iter - 1 ); - } - break; + nextFocusableActor = *( endIterator - 1 ); } - case Toolkit::Control::KeyboardFocus::RIGHT: + else { - if( iter == focusableActors.end() - 1 ) - { - nextFocusableActor = *( focusableActors.begin() ); - } - else - { - nextFocusableActor = *( iter + 1 ); - } - break; + nextFocusableActor = *( currentIterator - 1 ); } - - case Toolkit::Control::KeyboardFocus::UP: + break; + } + case Toolkit::Control::KeyboardFocus::RIGHT: + { + if( currentIterator == endIterator - 1 ) { - if( mContent && *iter == mContent ) - { - nextFocusableActor = *( focusableActors.end() - 1 ); - } - else - { - if( mContent && mContent.IsKeyboardFocusable() ) - { - nextFocusableActor = mContent; - } - else - { - if ( iter == focusableActors.begin() ) - { - nextFocusableActor = *( focusableActors.end() - 1 ); - } - else - { - nextFocusableActor = *( iter - 1 ); - } - } - } - break; + nextFocusableActor = *( focusableActors.begin() ); } - - case Toolkit::Control::KeyboardFocus::DOWN: + else { - if( mContent && mContent.IsKeyboardFocusable() ) - { - nextFocusableActor = mContent; - } - else - { - if( iter == focusableActors.end() - 1 ) - { - nextFocusableActor = *( focusableActors.begin() ); - } - else - { - nextFocusableActor = *( iter + 1 ); - } - } - break; + nextFocusableActor = *( currentIterator + 1 ); } + break; } - if( !nextFocusableActor ) + case Toolkit::Control::KeyboardFocus::UP: { - DALI_LOG_WARNING( "Can not decide next focusable actor\n" ); + nextFocusableActor = *( focusableActors.begin() ); + break; } - break; + case Toolkit::Control::KeyboardFocus::DOWN: + { + nextFocusableActor = *( endIterator - 1 ); + break; + } + } + + if( !nextFocusableActor ) + { + DALI_LOG_WARNING( "Can not decide next focusable actor\n" ); } } } @@ -1846,6 +1894,7 @@ Actor Popup::GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit:: return nextFocusableActor; } + } // namespace Internal } // namespace Toolkit