X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.cpp;h=fa9bc5a0b493717e88448588f6ecc6730c65fc98;hb=31df2b9472ccbe0ae460a958535be8ef790c96f2;hp=a5aed9b6bcc50842fd61daae5c0d00523b4c3dd5;hpb=ded71874c72f72de672b8df770b4983a5d846944;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index a5aed9b..fa9bc5a 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -21,23 +21,25 @@ // EXTERNAL INCLUDES #include // for strcmp #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include // INTERNAL INCLUDES #include #include +#include #include -#include +#include #include +#include using namespace Dali; @@ -61,8 +63,8 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Popup, Toolkit::Control, Create ) -DALI_SIGNAL_REGISTRATION( Popup, "touched-outside", SIGNAL_TOUCHED_OUTSIDE ) -DALI_SIGNAL_REGISTRATION( Popup, "hidden", SIGNAL_HIDDEN ) +DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "touched-outside", SIGNAL_TOUCHED_OUTSIDE ) +DALI_SIGNAL_REGISTRATION( Toolkit, Popup, "hidden", SIGNAL_HIDDEN ) DALI_TYPE_REGISTRATION_END() @@ -127,10 +129,10 @@ void Popup::OnInitialize() // Create Layer mLayer = Layer::New(); mLayer.SetName( "POPUP_LAYER" ); + mLayer.SetDepthTestDisabled( true ); mLayer.SetParentOrigin(ParentOrigin::CENTER); mLayer.SetAnchorPoint(AnchorPoint::CENTER); mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - mLayer.SetDrawMode( DrawMode::OVERLAY ); // Any content after this point which is added to Self() will be reparented to // mContent. @@ -172,12 +174,6 @@ void Popup::OnInitialize() SetAsKeyboardFocusGroup(true); } -void Popup::MarkDirtyForRelayout() -{ - // Flag all the popup controls for relayout as it is about to be hidden and miss the main flagging pass - mLayer.RelayoutRequestTree(); -} - void Popup::OnPropertySet( Property::Index index, Property::Value propertyValue ) { if( index == mPropertyTitle ) @@ -228,6 +224,11 @@ void Popup::SetBackgroundImage( Actor image ) mBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); mBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); + if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) + { + imageActor.SetSortModifier( BACKGROUND_DEPTH_INDEX ); + } + Vector3 border( mPopupStyle->backgroundOuterBorder.x, mPopupStyle->backgroundOuterBorder.z, 0.0f ); mBackgroundImage.SetSizeModeFactor( border ); @@ -248,6 +249,11 @@ void Popup::SetButtonAreaImage( Actor image ) // Adds new area image to the dialog. mButtonAreaImage = image; + if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) + { + imageActor.SetSortModifier( BACKGROUND_DEPTH_INDEX + 1 ); + } + // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mButtonAreaImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); @@ -302,7 +308,6 @@ void Popup::CreateFooter() // Adds bottom background mBottomBg = Actor::New(); mBottomBg.SetName( "POPUP_BOTTOM_BG" ); - mBottomBg.SetRelayoutEnabled( true ); mBottomBg.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mPopupLayout.SetFixedHeight( 2, mPopupStyle->bottomSize.height ); // Buttons @@ -422,14 +427,14 @@ void Popup::CreateBacking() { mBacking = Dali::Toolkit::CreateSolidColorActor( mPopupStyle->backingColor ); mBacking.SetName( "POPUP_BACKING" ); - + mBacking.SetSortModifier( BACKGROUND_DEPTH_INDEX - 1 ); mBacking.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mBacking.SetSensitive(true); mLayer.Add( mBacking ); mBacking.SetOpacity(0.0f); mBacking.TouchedSignal().Connect( this, &Popup::OnBackingTouched ); - mBacking.MouseWheelEventSignal().Connect(this, &Popup::OnBackingMouseWheelEvent); + mBacking.WheelEventSignal().Connect(this, &Popup::OnBackingWheelEvent); } void Popup::CreateDialog() @@ -526,13 +531,13 @@ void Popup::HandleStateChange( Toolkit::Popup::PopupState state, float duration if(mShowing) { - mAnimation.AnimateTo( Property(mBacking, Actor::Property::COLOR_ALPHA), targetBackingAlpha, AlphaFunctions::EaseInOut, TimePeriod(0.0f, duration * 0.5f) ); - mAnimation.AnimateTo( Property(self, Actor::Property::SCALE), targetSize, AlphaFunctions::EaseInOut, TimePeriod(duration * 0.5f, duration * 0.5f) ); + mAnimation.AnimateTo( Property(mBacking, Actor::Property::COLOR_ALPHA), targetBackingAlpha, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration * 0.5f) ); + mAnimation.AnimateTo( Property(self, Actor::Property::SCALE), targetSize, AlphaFunction::EASE_IN_OUT, TimePeriod(duration * 0.5f, duration * 0.5f) ); } else { - mAnimation.AnimateTo( Property(mBacking, Actor::Property::COLOR_ALPHA), targetBackingAlpha, AlphaFunctions::EaseInOut, TimePeriod(0.0f, duration * 0.5f) ); - mAnimation.AnimateTo( Property(self, Actor::Property::SCALE), targetSize, AlphaFunctions::EaseInOut, TimePeriod(0.0f, duration * 0.5f) ); + mAnimation.AnimateTo( Property(mBacking, Actor::Property::COLOR_ALPHA), targetBackingAlpha, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration * 0.5f) ); + mAnimation.AnimateTo( Property(self, Actor::Property::SCALE), targetSize, AlphaFunction::EASE_IN_OUT, TimePeriod(0.0f, duration * 0.5f) ); } mAnimation.Play(); mAnimation.FinishedSignal().Connect(this, &Popup::OnStateAnimationFinished); @@ -617,9 +622,9 @@ bool Popup::OnBackingTouched(Actor actor, const TouchEvent& event) return true; } -bool Popup::OnBackingMouseWheelEvent(Actor actor, const MouseWheelEvent& event) +bool Popup::OnBackingWheelEvent(Actor actor, const WheelEvent& event) { - // consume mouse wheel event in dimmed backing actor + // consume wheel event in dimmed backing actor return true; } @@ -653,7 +658,7 @@ void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) mBackgroundImage.SetVisible( !( mButtons.empty() && mPopupLayout.GetChildCount() == 0 ) ); // Relayout All buttons - if ( !mButtons.empty() ) + if( !mButtons.empty() ) { // All buttons should be the same size and fill the button area. The button spacing needs to be accounted for as well. Vector2 buttonSize( ( ( size.width - mPopupStyle->buttonSpacing * ( mButtons.size() + 1 ) ) / mButtons.size() ), @@ -661,7 +666,7 @@ void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) Vector3 buttonPosition( mPopupStyle->buttonSpacing, 0.0f, 0.0f ); - for ( ActorIter iter = mButtons.begin(), endIter = mButtons.end(); + for( std::vector< Actor >::iterator iter = mButtons.begin(), endIter = mButtons.end(); iter != endIter; ++iter, buttonPosition.x += mPopupStyle->buttonSpacing + buttonSize.width ) { @@ -682,8 +687,8 @@ void Popup::OnRelayout( const Vector2& size, RelayoutContainer& container ) button.SetPosition( buttonPosition ); - button.PropagateRelayoutFlags(); // Reset relayout flags for relayout - container.Add( button, buttonSize ); + //Todo: Use the size negotiation pass instead of SetSize directly + button.SetSize( buttonSize ); } } } @@ -816,7 +821,7 @@ float Popup::GetWidthForHeight( float height ) return GetNaturalSize().width; } -Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) +Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) { Actor nextFocusableActor( currentFocusedActor ); @@ -839,7 +844,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C else { // Rebuild the focus chain because button or content can be added or removed dynamically - ActorContainer focusableActors; + std::vector< Actor > focusableActors; if( mContent && mContent.IsKeyboardFocusable() ) { focusableActors.push_back(mContent); @@ -853,13 +858,13 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C } } - for ( ActorContainer::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter ) + for( std::vector< Actor >::iterator iter = focusableActors.begin(), end = focusableActors.end(); iter != end; ++iter ) { if ( currentFocusedActor == *iter ) { switch ( direction ) { - case Toolkit::Control::Left: + case Toolkit::Control::KeyboardFocus::LEFT: { if ( iter == focusableActors.begin() ) { @@ -871,7 +876,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C } break; } - case Toolkit::Control::Right: + case Toolkit::Control::KeyboardFocus::RIGHT: { if ( iter == focusableActors.end() - 1 ) { @@ -884,7 +889,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C break; } - case Toolkit::Control::Up: + case Toolkit::Control::KeyboardFocus::UP: { if ( *iter == mContent ) { @@ -911,7 +916,7 @@ Actor Popup::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::C break; } - case Toolkit::Control::Down: + case Toolkit::Control::KeyboardFocus::DOWN: { if ( mContent && mContent.IsKeyboardFocusable() ) {