X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=b9232952388979d771abbf6a53a0d419a41140e4;hp=3a0a7eb56d57d6df5bdc6f331c729eb1e17f6540;hb=e9d852fcdacc5788785bfe0b617bd757794e8208;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 3a0a7eb..b923295 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -19,13 +19,40 @@ #include "button-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include +#include #include -#include -#include -#include +#include +#include // INTERNAL INCLUDES +#include +#include + +/** + * Button states and contents + * (3) mSelectedContent + * (2) mUnselectedContent (2) mSelectedBackgroundContent + * (1) mBackgroundContent (1) mBackgroundContent + * < unselected > ----------------------- < selected > + * | OnSelect() | + * | OnDisabled() | OnDisabled() + * | | + * < disabled > < disabled-selected > + * (2) mDisabledContent (2) mDisabledSelectedContent + * (1) mDisabledBackgroundContent (1) mDisabledBackgroundContent + * + * The drawing order of child actors is as follows. + * + * Top mLabel + * | mUnselectedContent / mSelectedContent / mDisabledContent / mDisabledSelectedContent + * | mSelectedBackgroundContent + * Bottom mBackgroundContent / mDisabledBackgroundContent + * + * Some of contents may be missed. + * And 2 images - fade-in image and fade-out image - in the same layer can be shown during the transition animation. Fade-in image should be above fade-out image. + */ namespace Dali { @@ -48,23 +75,30 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create ); -DALI_PROPERTY_REGISTRATION( Button, "disabled", BOOLEAN, DISABLED ) -DALI_PROPERTY_REGISTRATION( Button, "auto-repeating", BOOLEAN, AUTO_REPEATING ) -DALI_PROPERTY_REGISTRATION( Button, "initial-auto-repeating-delay", FLOAT, INITIAL_AUTO_REPEATING_DELAY ) -DALI_PROPERTY_REGISTRATION( Button, "next-auto-repeating-delay", FLOAT, NEXT_AUTO_REPEATING_DELAY ) -DALI_PROPERTY_REGISTRATION( Button, "togglable", BOOLEAN, TOGGLABLE ) -DALI_PROPERTY_REGISTRATION( Button, "selected", BOOLEAN, SELECTED ) -DALI_PROPERTY_REGISTRATION( Button, "normal-state-actor", MAP, NORMAL_STATE_ACTOR ) -DALI_PROPERTY_REGISTRATION( Button, "selected-state-actor", MAP, SELECTED_STATE_ACTOR ) -DALI_PROPERTY_REGISTRATION( Button, "disabled-state-actor", MAP, DISABLED_STATE_ACTOR ) -DALI_PROPERTY_REGISTRATION( Button, "label-actor", MAP, LABEL_ACTOR ) - -DALI_SIGNAL_REGISTRATION( Button, "pressed", SIGNAL_PRESSED ) -DALI_SIGNAL_REGISTRATION( Button, "released", SIGNAL_RELEASED ) -DALI_SIGNAL_REGISTRATION( Button, "clicked", SIGNAL_CLICKED ) -DALI_SIGNAL_REGISTRATION( Button, "state-changed", SIGNAL_STATE_CHANGED ) - -DALI_ACTION_REGISTRATION( Button, "button-click", ACTION_BUTTON_CLICK ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled", BOOLEAN, DISABLED ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "autoRepeating", BOOLEAN, AUTO_REPEATING ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initialAutoRepeatingDelay", FLOAT, INITIAL_AUTO_REPEATING_DELAY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "nextAutoRepeatingDelay", FLOAT, NEXT_AUTO_REPEATING_DELAY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "togglable", BOOLEAN, TOGGLABLE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected", BOOLEAN, SELECTED ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedStateImage", STRING, UNSELECTED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedStateImage", STRING, SELECTED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledStateImage", STRING, DISABLED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedColor", VECTOR4, UNSELECTED_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedColor", VECTOR4, SELECTED_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label", MAP, LABEL ) + +// Deprecated properties: +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelText", STRING, LABEL_TEXT ) + +// Signals: +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "pressed", SIGNAL_PRESSED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "released", SIGNAL_RELEASED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "clicked", SIGNAL_CLICKED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "stateChanged", SIGNAL_STATE_CHANGED ) + +// Actions: +DALI_ACTION_REGISTRATION( Toolkit, Button, "buttonClick", ACTION_BUTTON_CLICK ) DALI_TYPE_REGISTRATION_END() @@ -76,6 +110,8 @@ const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f ); Button::Button() : Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), mAutoRepeatingTimer(), + mUnselectedColor( Color::WHITE ), // The natural colors of the specified images will be used by default. + mSelectedColor( Color::WHITE ), mDisabled( false ), mAutoRepeating( false ), mTogglableButton( false ), @@ -84,26 +120,141 @@ Button::Button() mNextAutoRepeatingDelay( NEXT_AUTOREPEATING_DELAY ), mAnimationTime( 0.0f ), mClickActionPerforming( false ), - mState( ButtonUp ) + mState( ButtonUp ), + mPaintState( UnselectedState ) { } Button::~Button() { - if( mAutoRepeatingTimer ) - { - mAutoRepeatingTimer.Reset(); - } } void Button::SetDisabled( bool disabled ) { - if( disabled != mDisabled ) + if( disabled == mDisabled ) { - mDisabled = disabled; + return; + } + + StopTransitionAnimation(); + + mDisabled = disabled; - OnDisabled( mDisabled ); + // Notifies the derived class the button has been disabled. + OnDisabled(); + + switch( mPaintState ) + { + case UnselectedState: + { + //Layer Order + //(3) mDisabledContent (Inserted) + //(4) mUnselectedContent + //(2) mDisabledBackgroundContent (Inserted) + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + TransitionButtonImage( mDisabledBackgroundContent ); + AddButtonImage( mUnselectedContent ); + TransitionButtonImage( mDisabledContent ); + + AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ SELECTED_DECORATION ] ); + TransitionOut( mUnselectedContent ); + TransitionOut( mSelectedContent ); + TransitionOut( mBackgroundContent ); + TransitionOut( mSelectedBackgroundContent ); + TransitionOut( mDisabledSelectedContent ); + + mPaintState = DisabledUnselectedState; + break; + } + case SelectedState: + { + //Layer Order + //(5) mDisabledSelectedContent (Inserted) + //(4) mSelectedContent + //(3) mDisabledBackgroundContent (Inserted) + //(2) mSelectedBackgroundContent + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + AddButtonImage( mSelectedBackgroundContent ); + TransitionButtonImage( mDisabledBackgroundContent ); + AddButtonImage( mSelectedContent ); + TransitionButtonImage( mDisabledSelectedContent ); + + AddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionOut( mUnselectedContent ); + TransitionOut( mSelectedContent ); + TransitionOut( mBackgroundContent ); + TransitionOut( mSelectedBackgroundContent ); + TransitionOut( mDisabledContent ); + + mPaintState = DisabledSelectedState; + break; + } + case DisabledUnselectedState: + { + //Layer Order + //(3) mUnselectedContent (Inserted) + //(4) mDisabledContent + //(2) mBackgroundContent (Inserted) + //(1) mDisabledBackgroundContent + + AddButtonImage( mDisabledBackgroundContent ); + TransitionButtonImage( mBackgroundContent ); + AddButtonImage( mDisabledContent ); + TransitionButtonImage( mUnselectedContent ); + + AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ SELECTED_DECORATION ] ); + TransitionOut( mSelectedContent ); + TransitionOut( mSelectedBackgroundContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = UnselectedState; + break; + } + case DisabledSelectedState: + { + //Layer Order + //(4) mSelectedContent (Inserted) + //(5) mDisabledSelectedContent + //(3) mSelectedBackgroundContent (Inserted) + //(2) mBackgroundContent (Inserted) + //(1) mDisabledBackgroundContent + + AddButtonImage( mDisabledBackgroundContent ); + TransitionButtonImage( mBackgroundContent ); + TransitionButtonImage( mSelectedBackgroundContent ); + AddButtonImage( mDisabledSelectedContent ); + TransitionButtonImage( mSelectedContent ); + + AddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionOut( mUnselectedContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = SelectedState; + break; + } } + + StartTransitionAnimation(); } bool Button::IsDisabled() const @@ -123,11 +274,7 @@ void Button::SetAutoRepeating( bool autoRepeating ) if( mSelected ) { // Emit a signal is not wanted, only change the appearance. - OnSelected( false ); - - mSelected = false; - - RelayoutRequest(); + SetSelected( false, false ); } } } @@ -179,18 +326,91 @@ void Button::SetSelected( bool selected ) { if( !mDisabled && mTogglableButton && ( selected != mSelected ) ) { - // Notifies the derived class the button has been selected. - OnSelected( selected ); + SetSelected( selected, true ); + } +} + +void Button::SetSelected( bool selected, bool emitSignal ) +{ + StopTransitionAnimation(); + + mSelected = selected; + + // Notifies the derived class the button has been selected. + OnSelected(); + + switch( mPaintState ) + { + case UnselectedState: + { + //Layer Order + //(3) mSelectedContent (Inserted) + //(4) mUnselectedContent + //(2) mSelectedBackgroundContent (Inserted) + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + TransitionButtonImage( mSelectedBackgroundContent ); + AddButtonImage( mUnselectedContent ); + TransitionButtonImage( mSelectedContent ); + + AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionOut( mUnselectedContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = SelectedState; + break; + } + case SelectedState: + { + //Layer Order + //(3) mUnselectedContent (Inserted) + //(2) mSelectedContent + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + AddButtonImage( mSelectedContent ); + TransitionButtonImage( mUnselectedContent ); + + AddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + TransitionButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ SELECTED_DECORATION ] ); + TransitionOut( mSelectedContent ); + TransitionOut( mSelectedBackgroundContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = UnselectedState; + break; + } + case DisabledUnselectedState: + case DisabledSelectedState: + { + DALI_ASSERT_DEBUG( 0 && "Shouldn't be able to change paint state if the button is disabled." ); + break; + } + } - mSelected = selected; + StartTransitionAnimation(); + if( emitSignal ) + { Toolkit::Button handle( GetOwner() ); // Emit signal. mStateChangedSignal.Emit( handle ); - - RelayoutRequest(); } + + RelayoutRequest(); } bool Button::IsSelected() const @@ -208,50 +428,202 @@ float Button::GetAnimationTime() const return mAnimationTime; } -void Button::SetLabel( const std::string& label ) +void Button::SetLabelText( const std::string& label ) { + Property::Map labelProperty; + labelProperty.Insert( "text", label ); + ModifyLabel( labelProperty ); } -void Button::SetLabel( Actor label ) +std::string Button::GetLabelText() const { - if( mLabel != label ) + Toolkit::TextLabel label = Dali::Toolkit::TextLabel::DownCast( mLabel ); + if( label ) { - if( mLabel && mLabel.GetParent() ) + return label.GetProperty( Dali::Toolkit::TextLabel::Property::TEXT ); + } + return std::string(); +} + +void Button::ModifyLabel( const Property::Map& properties ) +{ + // If we don't have a label yet, create one. + if( !mLabel ) + { + // If we don't have a label, create one and set it up. + // Note: The label text is set from the passed in property map after creation. + mLabel = Toolkit::TextLabel::New(); + mLabel.SetPosition( 0.0f, 0.0f ); + // label should be the top of the button + Self().Add( mLabel ); + } + + // Set any properties specified for the label by iterating through all property key-value pairs. + for( unsigned int i = 0, mapCount = properties.Count(); i < mapCount; ++i ) + { + const StringValuePair& propertyPair( properties.GetPair( i ) ); + + // Convert the property string to a property index. + Property::Index setPropertyIndex = mLabel.GetPropertyIndex( propertyPair.first ); + if( setPropertyIndex != Property::INVALID_INDEX ) { - mLabel.GetParent().Remove( mLabel ); + // If the conversion worked, we have a valid property index, + // Set the property to the new value. + mLabel.SetProperty( setPropertyIndex, propertyPair.second ); } + } - mLabel = label; + // Notify derived button classes of the change. + OnLabelSet( false ); - OnLabelSet(); + RelayoutRequest(); +} - RelayoutRequest(); +Actor& Button::GetLabelActor() +{ + return mLabel; +} + +void Button::SetDecoration( DecorationState state, Actor actor ) +{ + if( mDecoration[ state ] && mDecoration[ state ].GetParent() ) + { + mDecoration[ state ].Unparent(); } + + mDecoration[ state ] = actor; + mDecoration[ state ].SetColorMode( USE_OWN_COLOR ); + + ResetImageLayers(); + RelayoutRequest(); } -Actor Button::GetLabel() const +Actor& Button::GetDecoration( DecorationState state ) { - return mLabel; + return mDecoration[ state ]; } -Actor& Button::GetLabel() +void Button::SetupContent( Actor& actorToModify, Actor newActor ) { - return mLabel; + if( newActor ) + { + StopTransitionAnimation(); + + if( actorToModify && actorToModify.GetParent() ) + { + actorToModify.Unparent(); + } + + actorToModify = newActor; + + if( actorToModify ) + { + actorToModify.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + actorToModify.SetParentOrigin( ParentOrigin::TOP_LEFT ); + actorToModify.SetPosition( 0.f, 0.f ); + } + + ResetImageLayers(); + } } -Actor Button::GetButtonImage() const +void Button::SetUnselectedColor( const Vector4& color ) +{ + mUnselectedColor = color; + + if( mUnselectedContent && !GetUnselectedImageFilename().empty() ) + { + // If there is existing unselected content, change the color on it directly. + mUnselectedContent.SetColor( mUnselectedColor ); + } + else + { + // If there is no existing content, create a new actor to use for flat color. + Toolkit::Control unselectedContentActor = Toolkit::Control::New(); + unselectedContentActor.SetBackgroundColor( mUnselectedColor ); + SetupContent( mUnselectedContent, unselectedContentActor ); + mUnselectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + } +} + +const Vector4 Button::GetUnselectedColor() const { - return mButtonContent; + return mUnselectedColor; } -Actor& Button::GetButtonImage() +void Button::SetSelectedColor( const Vector4& color ) { - return mButtonContent; + mSelectedColor = color; + + if( mSelectedContent && !GetSelectedImageFilename().empty() ) + { + // If there is existing unselected content, change the color on it directly. + mSelectedContent.SetColor( mSelectedColor ); + } + else + { + // If there is no existing content, create a new actor to use for flat color. + Toolkit::Control selectedContentActor = Toolkit::Control::New(); + selectedContentActor.SetBackgroundColor( mSelectedColor ); + SetupContent( mSelectedContent, selectedContentActor ); + mSelectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + } } -Actor Button::GetSelectedImage() const +const Vector4 Button::GetSelectedColor() const { - return mSelectedContent; + return mSelectedColor; +} + +void Button::SetUnselectedImage( const std::string& filename ) +{ + Toolkit::ImageView newContent; + if( !filename.empty() ) + { + newContent = Toolkit::ImageView::New( filename ); + } + else + { + newContent = Toolkit::ImageView::New(); + } + + if( newContent ) + { + SetupContent( mUnselectedContent, newContent ); + + mUnselectedContent.SetColor( mUnselectedColor ); + + OnUnselectedImageSet(); + RelayoutRequest(); + } +} + +Actor& Button::GetUnselectedImage() +{ + return mUnselectedContent; +} + +void Button::SetSelectedImage( const std::string& filename ) +{ + Toolkit::ImageView newContent; + if( !filename.empty() ) + { + newContent = Toolkit::ImageView::New( filename ); + } + else + { + newContent = Toolkit::ImageView::New(); + } + + if( newContent ) + { + SetupContent( mSelectedContent, newContent ); + + mSelectedContent.SetColor( mSelectedColor ); + + OnSelectedImageSet(); + RelayoutRequest(); + } } Actor& Button::GetSelectedImage() @@ -259,9 +631,12 @@ Actor& Button::GetSelectedImage() return mSelectedContent; } -Actor Button::GetBackgroundImage() const +void Button::SetBackgroundImage( const std::string& filename ) { - return mBackgroundContent; + SetupContent( mBackgroundContent, Toolkit::ImageView::New( filename ) ); + + OnBackgroundImageSet(); + RelayoutRequest(); } Actor& Button::GetBackgroundImage() @@ -269,9 +644,25 @@ Actor& Button::GetBackgroundImage() return mBackgroundContent; } -Actor Button::GetDisabledImage() const +void Button::SetSelectedBackgroundImage( const std::string& filename ) { - return mDisabledContent; + SetupContent( mSelectedBackgroundContent, Toolkit::ImageView::New( filename ) ); + + OnSelectedBackgroundImageSet(); + RelayoutRequest(); +} + +Actor& Button::GetSelectedBackgroundImage() +{ + return mSelectedBackgroundContent; +} + +void Button::SetDisabledImage( const std::string& filename ) +{ + SetupContent( mDisabledContent, Toolkit::ImageView::New( filename ) ); + + OnDisabledImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledImage() @@ -279,9 +670,12 @@ Actor& Button::GetDisabledImage() return mDisabledContent; } -Actor Button::GetDisabledSelectedImage() const +void Button::SetDisabledSelectedImage( const std::string& filename ) { - return mDisabledSelectedContent; + SetupContent( mDisabledSelectedContent, Toolkit::ImageView::New( filename ) ); + + OnDisabledSelectedImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledSelectedImage() @@ -289,9 +683,12 @@ Actor& Button::GetDisabledSelectedImage() return mDisabledSelectedContent; } -Actor Button::GetDisabledBackgroundImage() const +void Button::SetDisabledBackgroundImage( const std::string& filename ) { - return mDisabledBackgroundContent; + SetupContent( mDisabledBackgroundContent, Toolkit::ImageView::New( filename ) ); + + OnDisabledBackgroundImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledBackgroundImage() @@ -299,7 +696,98 @@ Actor& Button::GetDisabledBackgroundImage() return mDisabledBackgroundContent; } -bool Button::DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes ) +std::string Button::GetUnselectedImageFilename() const +{ + if( mUnselectedContent ) + { + ResourceImage image = ResourceImage::DownCast( mUnselectedContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetSelectedImageFilename() const +{ + if( mSelectedContent ) + { + ResourceImage image = ResourceImage::DownCast( mSelectedContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetBackgroundImageFilename() const +{ + if( mBackgroundContent ) + { + ResourceImage image = ResourceImage::DownCast( mBackgroundContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetSelectedBackgroundImageFilename() const +{ + if( mSelectedBackgroundContent ) + { + ResourceImage image = ResourceImage::DownCast( mSelectedBackgroundContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetDisabledImageFilename() const +{ + if( mDisabledContent ) + { + ResourceImage image = ResourceImage::DownCast( mDisabledContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetDisabledSelectedImageFilename() const +{ + if( mDisabledSelectedContent ) + { + ResourceImage image = ResourceImage::DownCast( mDisabledSelectedContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +std::string Button::GetDisabledBackgroundImageFilename() const +{ + if( mDisabledBackgroundContent ) + { + ResourceImage image = ResourceImage::DownCast( mDisabledBackgroundContent ); + if( image ) + { + return image.GetUrl(); + } + } + return std::string(); +} + +bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { bool ret = false; @@ -311,14 +799,13 @@ bool Button::DoAction( BaseObject* object, const std::string& actionName, const if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) ) { - GetImplementation( button ).DoClickAction( attributes ); - ret = true; + ret = GetImplementation( button ).DoClickAction( attributes ); } return ret; } -void Button::DoClickAction( const PropertyValueContainer& attributes ) +bool Button::DoClickAction( const Property::Map& attributes ) { // Prevents the button signals from doing a recursive loop by sending an action // and re-emitting the signals. @@ -329,7 +816,11 @@ void Button::DoClickAction( const PropertyValueContainer& attributes ) mState = ButtonDown; OnButtonUp(); mClickActionPerforming = false; + + return true; } + + return false; } void Button::OnButtonStageDisconnection() @@ -338,10 +829,7 @@ void Button::OnButtonStageDisconnection() { if( !mTogglableButton ) { - Toolkit::Button handle( GetOwner() ); - - // Notifies the derived class the button has been released. - OnReleased(); + Released(); if( mAutoRepeating ) { @@ -355,19 +843,17 @@ void Button::OnButtonDown() { if( !mTogglableButton ) { - Toolkit::Button handle( GetOwner() ); - - // Notifies the derived class the button has been pressed. - OnPressed(); + Pressed(); if( mAutoRepeating ) { SetUpTimer( mInitialAutoRepeatingDelay ); } - - //Emit signal. - mPressedSignal.Emit( handle ); } + + // The pressed signal should be emitted regardless of toggle mode. + Toolkit::Button handle( GetOwner() ); + mPressedSignal.Emit( handle ); } void Button::OnButtonUp() @@ -380,21 +866,18 @@ void Button::OnButtonUp() } else { - // Notifies the derived class the button has been clicked. - OnReleased(); - OnClicked(); + Released(); if( mAutoRepeating ) { mAutoRepeatingTimer.Reset(); } - - Toolkit::Button handle( GetOwner() ); - - //Emit signal. - mReleasedSignal.Emit( handle ); - mClickedSignal.Emit( handle ); } + + // The clicked and released signals should be emitted regardless of toggle mode. + Toolkit::Button handle( GetOwner() ); + mReleasedSignal.Emit( handle ); + mClickedSignal.Emit( handle ); } } @@ -404,19 +887,17 @@ void Button::OnTouchPointLeave() { if( !mTogglableButton ) { - Toolkit::Button handle( GetOwner() ); - - // Notifies the derived class the button has been released. - OnReleased(); + Released(); if( mAutoRepeating ) { mAutoRepeatingTimer.Reset(); } - - //Emit signal. - mReleasedSignal.Emit( handle ); } + + // The released signal should be emitted regardless of toggle mode. + Toolkit::Button handle( GetOwner() ); + mReleasedSignal.Emit( handle ); } } @@ -554,11 +1035,26 @@ void Button::OnInitialize() self.SetKeyboardFocusable( true ); } -void Button::OnActivated() +bool Button::OnAccessibilityActivated() +{ + return OnKeyboardEnter(); +} + +bool Button::OnKeyboardEnter() +{ + // When the enter key is pressed, or button is activated, the click action is performed. + Property::Map attributes; + bool ret = DoClickAction( attributes ); + + return ret; +} + +void Button::OnStageDisconnection() { - // When the button is activated, it performs the click action - PropertyValueContainer attributes; - DoClickAction( attributes ); + OnButtonStageDisconnection(); // Notification for derived classes. + mState = ButtonUp; + + Control::OnStageDisconnection(); } void Button::OnTap(Actor actor, const TapGesture& tap) @@ -581,10 +1077,9 @@ bool Button::AutoRepeatingSlot() // Restart the autorepeat timer. SetUpTimer( mNextAutoRepeatingDelay ); - Toolkit::Button handle( GetOwner() ); + Pressed(); - // Notifies the derived class the button has been pressed. - OnPressed(); + Toolkit::Button handle( GetOwner() ); //Emit signal. consumed = mReleasedSignal.Emit( handle ); @@ -595,10 +1090,75 @@ bool Button::AutoRepeatingSlot() return consumed; } -void Button::OnControlStageDisconnection() +void Button::Pressed() { - OnButtonStageDisconnection(); // Notification for derived classes. - mState = ButtonUp; + if( mPaintState == UnselectedState ) + { + StopTransitionAnimation(); + + // Notifies the derived class the button has been pressed. + OnPressed(); + + //Layer Order + //(4) mSelectedContent (Inserted) + //(3) mUnselectedContent + //(2) mSelectedBackgroundContent (Inserted) + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + TransitionButtonImage( mSelectedBackgroundContent ); + AddButtonImage( mUnselectedContent ); + TransitionButtonImage( mSelectedContent ); + + AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ UNSELECTED_DECORATION ] ); + TransitionOut( mUnselectedContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = SelectedState; + + StartTransitionAnimation(); + } +} + +void Button::Released() +{ + if( mPaintState == SelectedState ) + { + StopTransitionAnimation(); + + // Notifies the derived class the button has been released. + OnReleased(); + + //Layer Order + //(3) mUnselectedContent (Inserted) + //(2) mSelectedContent + //(1) mBackgroundContent + + AddButtonImage( mBackgroundContent ); + AddButtonImage( mSelectedContent ); + TransitionButtonImage( mUnselectedContent ); + + AddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + TransitionButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + + TransitionOut( mDecoration[ SELECTED_DECORATION ] ); + TransitionOut( mSelectedContent ); + TransitionOut( mSelectedBackgroundContent ); + TransitionOut( mDisabledContent ); + TransitionOut( mDisabledSelectedContent ); + TransitionOut( mDisabledBackgroundContent ); + + mPaintState = UnselectedState; + + StartTransitionAnimation(); + } } Button::ButtonState Button::GetState() @@ -606,6 +1166,223 @@ Button::ButtonState Button::GetState() return mState; } +Button::PaintState Button::GetPaintState() +{ + return mPaintState; +} + +void Button::PrepareAddButtonImage( Actor& actor ) +{ + if( actor ) + { + Self().Add( actor ); + PrepareForTranstionOut( actor ); + } +} + +void Button::TransitionButtonImage( Actor& actor ) +{ + if( actor ) + { + if( !actor.GetParent() ) + { + Self().Add( actor ); + } + + OnTransitionIn( actor ); + } +} + +void Button::AddButtonImage( Actor& actor ) +{ + if( actor ) + { + Self().Add( actor ); + } +} + +void Button::ReAddLabel() +{ + if( mLabel ) + { + mLabel.Unparent(); + Self().Add( mLabel ); + } +} + +void Button::RemoveButtonImage( Actor& actor ) +{ + if( actor ) + { + if( actor.GetParent() ) + { + Self().Remove( actor ); + } + PrepareForTranstionIn( actor ); + } +} + +unsigned int Button::FindChildIndex( Actor& actor ) +{ + Actor self = Self(); + unsigned int childrenNum = self.GetChildCount(); + + for( unsigned int i = 0; i < childrenNum; i++ ) + { + Actor child = self.GetChildAt( i ); + if( child == actor ) + { + return i; + } + } + + return childrenNum; +} + +void Button::TransitionOut( Actor actor ) +{ + OnTransitionOut( actor ); +} + +void Button::ResetImageLayers() +{ + // Ensure that all layers are in the correct order and state according to the paint state + + switch( mPaintState ) + { + case UnselectedState: + { + //Layer Order + //(2) mUnselectedContent + //(1) mBackgroundContent + + RemoveButtonImage( mDecoration[ SELECTED_DECORATION ] ); + RemoveButtonImage( mSelectedContent ); + RemoveButtonImage( mSelectedBackgroundContent ); + RemoveButtonImage( mDisabledContent ); + RemoveButtonImage( mDisabledSelectedContent ); + RemoveButtonImage( mDisabledBackgroundContent ); + + PrepareAddButtonImage( mBackgroundContent ); + PrepareAddButtonImage( mUnselectedContent ); + + PrepareAddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + break; + } + case SelectedState: + { + //Layer Order + //(3) mSelectedContent + //(2) mSelectedBackgroundContent + //(1) mBackgroundContent + + RemoveButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + RemoveButtonImage( mUnselectedContent ); + RemoveButtonImage( mDisabledContent ); + RemoveButtonImage( mDisabledSelectedContent ); + RemoveButtonImage( mDisabledBackgroundContent ); + + PrepareAddButtonImage( mBackgroundContent ); + PrepareAddButtonImage( mSelectedBackgroundContent ); + PrepareAddButtonImage( mSelectedContent ); + + PrepareAddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + break; + } + case DisabledUnselectedState: + { + //Layer Order + //(2) mDisabledContent + //(1) mDisabledBackgroundContent + + RemoveButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + RemoveButtonImage( mUnselectedContent ); + RemoveButtonImage( mBackgroundContent ); + RemoveButtonImage( mDecoration[ SELECTED_DECORATION ] ); + RemoveButtonImage( mSelectedContent ); + RemoveButtonImage( mDisabledSelectedContent ); + RemoveButtonImage( mSelectedBackgroundContent ); + + PrepareAddButtonImage( mDisabledBackgroundContent ? mDisabledBackgroundContent : mBackgroundContent ); + PrepareAddButtonImage( mDisabledContent ? mDisabledContent : mUnselectedContent ); + + PrepareAddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + ReAddLabel(); + break; + } + case DisabledSelectedState: + { + //Layer Order + // (2) mDisabledSelectedContent + // (1) mDisabledBackgroundContent + + RemoveButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); + RemoveButtonImage( mUnselectedContent ); + RemoveButtonImage( mDecoration[ SELECTED_DECORATION ] ); + RemoveButtonImage( mSelectedContent ); + RemoveButtonImage( mBackgroundContent ); + RemoveButtonImage( mSelectedBackgroundContent ); + RemoveButtonImage( mDisabledContent ); + + if( mDisabledBackgroundContent ) + { + PrepareAddButtonImage( mDisabledBackgroundContent ); + } + else + { + PrepareAddButtonImage( mBackgroundContent ); + PrepareAddButtonImage( mSelectedBackgroundContent ); + } + + PrepareAddButtonImage( mDisabledSelectedContent ? mDisabledSelectedContent : mSelectedContent ); + + PrepareAddButtonImage( mDecoration[ SELECTED_DECORATION ] ); + ReAddLabel(); + break; + } + } +} + +void Button::StartTransitionAnimation() +{ + if( mTransitionAnimation ) + { + mTransitionAnimation.Play(); + } + else + { + ResetImageLayers(); + } +} + +void Button::StopTransitionAnimation() +{ + if( mTransitionAnimation ) + { + mTransitionAnimation.Clear(); + mTransitionAnimation.Reset(); + } +} + +Dali::Animation Button::GetTransitionAnimation() +{ + if( !mTransitionAnimation ) + { + mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); + mTransitionAnimation.FinishedSignal().Connect( this, &Button::TransitionAnimationFinished ); + } + + return mTransitionAnimation; +} + +void Button::TransitionAnimationFinished( Dali::Animation& source ) +{ + StopTransitionAnimation(); + ResetImageLayers(); +} + void Button::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) { Toolkit::Button button = Toolkit::Button::DownCast( Dali::BaseHandle( object ) ); @@ -616,7 +1393,7 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope { case Toolkit::Button::Property::DISABLED: { - GetImplementation( button ).SetDisabled( value.Get() ); + GetImplementation( button ).SetDisabled( value.Get< bool >() ); break; } @@ -650,29 +1427,52 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope break; } - case Toolkit::Button::Property::NORMAL_STATE_ACTOR: + case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: + { + GetImplementation( button ).SetUnselectedImage( value.Get< std::string >() ); + break; + } + + case Toolkit::Button::Property::SELECTED_STATE_IMAGE: { - GetImplementation( button ).SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + GetImplementation( button ).SetSelectedImage( value.Get< std::string >() ); break; } - case Toolkit::Button::Property::SELECTED_STATE_ACTOR: + case Toolkit::Button::Property::DISABLED_STATE_IMAGE: { - GetImplementation( button ).SetSelectedImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + GetImplementation( button ).SetDisabledImage( value.Get< std::string >() ); break; } - case Toolkit::Button::Property::DISABLED_STATE_ACTOR: + case Toolkit::Button::Property::UNSELECTED_COLOR: { - GetImplementation( button ).SetDisabledImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + GetImplementation( button ).SetUnselectedColor( value.Get< Vector4 >() ); break; } - case Toolkit::Button::Property::LABEL_ACTOR: + case Toolkit::Button::Property::SELECTED_COLOR: { - GetImplementation( button ).SetLabel( Scripting::NewActor( value.Get< Property::Map >() ) ); + GetImplementation( button ).SetSelectedColor( value.Get< Vector4 >() ); break; } + + case Toolkit::Button::Property::LABEL_TEXT: + { + GetImplementation( button ).SetLabelText( value.Get< std::string >() ); + break; + } + + case Toolkit::Button::Property::LABEL: + { + // Get a Property::Map from the property if possible. + Property::Map setPropertyMap; + if( value.Get( setPropertyMap ) ) + { + GetImplementation( button ).ModifyLabel( setPropertyMap ); + } + } + break; } } } @@ -723,35 +1523,46 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert break; } - case Toolkit::Button::Property::NORMAL_STATE_ACTOR: + case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: + { + value = GetImplementation( button ).GetUnselectedImageFilename(); + break; + } + + case Toolkit::Button::Property::SELECTED_STATE_IMAGE: + { + value = GetImplementation( button ).GetSelectedImageFilename(); + break; + } + + case Toolkit::Button::Property::DISABLED_STATE_IMAGE: { - Property::Map map; - Scripting::CreatePropertyMap( GetImplementation( button ).mButtonContent, map ); - value = map; + value = GetImplementation( button ).GetDisabledImageFilename(); break; } - case Toolkit::Button::Property::SELECTED_STATE_ACTOR: + case Toolkit::Button::Property::UNSELECTED_COLOR: { - Property::Map map; - Scripting::CreatePropertyMap( GetImplementation( button ).mSelectedContent, map ); - value = map; + value = GetImplementation( button ).GetUnselectedColor(); break; } - case Toolkit::Button::Property::DISABLED_STATE_ACTOR: + case Toolkit::Button::Property::SELECTED_COLOR: { - Property::Map map; - Scripting::CreatePropertyMap( GetImplementation( button ).mDisabledContent, map ); - value = map; + value = GetImplementation( button ).GetSelectedColor(); break; } - case Toolkit::Button::Property::LABEL_ACTOR: + case Toolkit::Button::Property::LABEL_TEXT: { - Property::Map map; - Scripting::CreatePropertyMap( GetImplementation( button ).mLabel, map ); - value = map; + value = GetImplementation( button ).GetLabelText(); + break; + } + + case Toolkit::Button::Property::LABEL: + { + Property::Map emptyMap; + value = emptyMap; break; } } @@ -760,6 +1571,132 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert return value; } +// Deprecated API + +void Button::SetLabel( Actor label ) +{ + if( mLabel != label ) + { + if( mLabel && mLabel.GetParent() ) + { + mLabel.GetParent().Remove( mLabel ); + } + + mLabel = label; + mLabel.SetPosition( 0.0f, 0.0f ); + + // label should be the top of the button + Self().Add( mLabel ); + + ResetImageLayers(); + OnLabelSet( true ); + + RelayoutRequest(); + } +} + +void Button::SetButtonImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mUnselectedContent, image ); + + OnUnselectedImageSet(); + RelayoutRequest(); + } +} + +void Button::SetSelectedImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mSelectedContent, image ); + + OnSelectedImageSet(); + RelayoutRequest(); + } +} + +void Button::SetBackgroundImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mBackgroundContent, image ); + + OnBackgroundImageSet(); + RelayoutRequest(); + } +} + +void Button::SetSelectedBackgroundImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mSelectedBackgroundContent, image ); + + OnSelectedBackgroundImageSet(); + RelayoutRequest(); + } +} + +void Button::SetDisabledImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mDisabledContent, image ); + + OnDisabledImageSet(); + RelayoutRequest(); + } +} + +void Button::SetDisabledSelectedImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mDisabledSelectedContent, image ); + + OnDisabledSelectedImageSet(); + RelayoutRequest(); + } +} + +void Button::SetDisabledBackgroundImage( Actor image ) +{ + if( image ) + { + StopTransitionAnimation(); + + SetupContent( mDisabledBackgroundContent, image ); + + OnDisabledBackgroundImageSet(); + RelayoutRequest(); + } +} + +Actor Button::GetButtonImage() const +{ + return mUnselectedContent; +} + +Actor Button::GetSelectedImage() const +{ + return mSelectedContent; +} + + } // namespace Internal } // namespace Toolkit