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=0a58b7c4f167e1610c6d738a025d4fb3af988fc9;hp=b67bdcc41a732a98707d13324bf6333dda7d49d7;hb=99cfad1f8fe17f96c45004022372be6e78c22a0b;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index b67bdcc..0a58b7c 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -19,15 +19,16 @@ #include // EXTERNAL INCLUDES +#include // for strcmp #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include using namespace Dali; @@ -60,8 +62,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() @@ -121,14 +123,14 @@ void Popup::OnInitialize() Actor self = Self(); self.SetSensitive(false); // Reisize to fit the height of children - self.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT ); + self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); // Create Layer mLayer = Layer::New(); mLayer.SetName( "POPUP_LAYER" ); mLayer.SetParentOrigin(ParentOrigin::CENTER); mLayer.SetAnchorPoint(AnchorPoint::CENTER); - mLayer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + 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 @@ -147,8 +149,8 @@ void Popup::OnInitialize() mPopupLayout.SetName( "POPUP_LAYOUT_TABLE" ); mPopupLayout.SetParentOrigin(ParentOrigin::CENTER); mPopupLayout.SetAnchorPoint(AnchorPoint::CENTER); - mPopupLayout.SetResizePolicy( FILL_TO_PARENT, WIDTH ); - mPopupLayout.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT ); + mPopupLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); mPopupLayout.SetFitHeight( 0 ); // Set row to fit mPopupLayout.SetFitHeight( 1 ); // Set row to fit self.Add( mPopupLayout ); @@ -171,12 +173,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 ) @@ -223,11 +219,10 @@ void Popup::SetBackgroundImage( Actor image ) // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); - mBackgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); mBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); mBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); - mBackgroundImage.SetSizeMode( SIZE_FIXED_OFFSET_FROM_PARENT ); Vector3 border( mPopupStyle->backgroundOuterBorder.x, mPopupStyle->backgroundOuterBorder.z, 0.0f ); mBackgroundImage.SetSizeModeFactor( border ); @@ -251,7 +246,7 @@ void Popup::SetButtonAreaImage( Actor image ) // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mButtonAreaImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); - mButtonAreaImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mButtonAreaImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mButtonAreaImage.SetAnchorPoint( AnchorPoint::CENTER ); mButtonAreaImage.SetParentOrigin( ParentOrigin::CENTER ); @@ -263,13 +258,36 @@ void Popup::SetButtonAreaImage( Actor image ) void Popup::SetTitle( const std::string& text ) { -// TODO + // Replaces the current title actor. + if( mPopupLayout ) + { + mPopupLayout.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 0 ) ); + } + + mTitle = Toolkit::TextLabel::New( text ); + mTitle.SetName( "POPUP_TITLE" ); + mTitle.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); + mTitle.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + + if( mPopupLayout ) + { + mTitle.SetPadding( Padding( 0.0f, 0.0f, mPopupStyle->margin, mPopupStyle->margin ) ); + mTitle.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + mTitle.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); + mPopupLayout.AddChild( mTitle, Toolkit::TableView::CellPosition( 0, 0 ) ); + } + + RelayoutRequest(); } -const std::string& Popup::GetTitle() const +std::string Popup::GetTitle() const { - static std::string temp(""); - return temp; + if( mTitle ) + { + return mTitle.GetProperty( Toolkit::TextLabel::Property::TEXT ); + } + + return std::string(); } void Popup::CreateFooter() @@ -279,8 +297,7 @@ void Popup::CreateFooter() // Adds bottom background mBottomBg = Actor::New(); mBottomBg.SetName( "POPUP_BOTTOM_BG" ); - mBottomBg.SetRelayoutEnabled( true ); - mBottomBg.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBottomBg.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mPopupLayout.SetFixedHeight( 2, mPopupStyle->bottomSize.height ); // Buttons mPopupLayout.AddChild( mBottomBg, Toolkit::TableView::CellPosition( 2, 0 ) ); @@ -290,7 +307,7 @@ void Popup::CreateFooter() void Popup::AddButton( Toolkit::Button button ) { mButtons.push_back( button ); - button.SetResizePolicy( USE_ASSIGNED_SIZE, ALL_DIMENSIONS ); // Size will be assigned to it + button.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::ALL_DIMENSIONS ); // Size will be assigned to it // If this is the first button added if( mButtons.size() == 1 ) @@ -400,7 +417,7 @@ void Popup::CreateBacking() mBacking = Dali::Toolkit::CreateSolidColorActor( mPopupStyle->backingColor ); mBacking.SetName( "POPUP_BACKING" ); - mBacking.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBacking.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mBacking.SetSensitive(true); mLayer.Add( mBacking ); @@ -503,13 +520,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); @@ -630,7 +647,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() ), @@ -638,7 +655,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 ) { @@ -659,29 +676,29 @@ 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 ); } } } -void Popup::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) +void Popup::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { if( mPopupLayout ) { - if( policy == FIT_TO_CHILDREN ) + if( policy == ResizePolicy::FIT_TO_CHILDREN ) { - mPopupLayout.SetResizePolicy( USE_NATURAL_SIZE, dimension ); - if( dimension & HEIGHT ) + mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, dimension ); + if( dimension & Dimension::HEIGHT ) { mPopupLayout.SetFitHeight( 1 ); } } else { - mPopupLayout.SetResizePolicy( FILL_TO_PARENT, dimension ); + mPopupLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, dimension ); // Make the content cell fill the whole of the available space - if( dimension & HEIGHT ) + if( dimension & Dimension::HEIGHT ) { mPopupLayout.SetRelativeHeight( 1, 1.0f ); } @@ -712,6 +729,29 @@ Vector3 Popup::GetNaturalSize() Vector3 naturalSize( 0.0f, 0.0f, 0.0f ); + if ( mTitle ) + { + Vector3 titleNaturalSize = mTitle.GetImplementation().GetNaturalSize(); + // Buffer to avoid errors. The width of the popup could potentially be the width of the title text. + // It was observed in this case that text wrapping was then inconsistent when seen on device + const float titleBuffer = 0.5f; + titleNaturalSize.width += titleBuffer; + + // As TextLabel GetNaturalSize does not take wrapping into account, limit the width + // to that of the stage + if( titleNaturalSize.width >= maxWidth) + { + naturalSize.width = maxWidth; + naturalSize.height = mTitle.GetImplementation().GetHeightForWidth( naturalSize.width ); + } + else + { + naturalSize += titleNaturalSize; + } + + naturalSize.height += mPopupStyle->margin; + } + if( mContent ) { Vector3 contentSize = mContent.GetNaturalSize(); @@ -742,6 +782,12 @@ float Popup::GetHeightForWidth( float width ) float height( 0.0f ); float popupWidth( width - 2.f * ( POPUP_OUT_MARGIN_WIDTH + mPopupStyle->margin ) ); + if ( mTitle ) + { + height += mTitle.GetImplementation().GetHeightForWidth( popupWidth ); + height += mPopupStyle->margin; + } + if( mContent ) { height += mContent.GetHeightForWidth( popupWidth ) + mPopupStyle->margin; @@ -787,7 +833,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); @@ -801,7 +847,7 @@ 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 ) {