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=a8ab543a12c7f1636efa58a596753c08dc9a5f6c;hp=ff395aee9a715c80f08e2db64e18ba22aa8b4132;hb=6c02c5852ca329f720e4ae72d9cef2524629574c;hpb=28d0de15155c9923010da5c53eb1a96cbf6cd6e4 diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index ff395ae..a8ab543 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,40 +20,32 @@ // EXTERNAL INCLUDES #include // for strcmp -#include +#include +#include +#include #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. - */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if defined(DEBUG_ENABLED) + Debug::Filter* gLogButtonFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_BUTTON_CONTROL"); +#endif namespace Dali { @@ -74,206 +66,123 @@ BaseHandle Create() } // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create ); - -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled", BOOLEAN, DISABLED ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "auto-repeating", BOOLEAN, AUTO_REPEATING ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initial-auto-repeating-delay", FLOAT, INITIAL_AUTO_REPEATING_DELAY ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "next-auto-repeating-delay", 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, "unselected-state-image", STRING, UNSELECTED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-state-image", STRING, SELECTED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled-state-image", STRING, DISABLED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselected-color", VECTOR4, UNSELECTED_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-color", VECTOR4, SELECTED_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label-text", STRING, LABEL_TEXT ) - +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create ) + +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", MAP, UNSELECTED_STATE_IMAGE ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedStateImage", MAP, SELECTED_STATE_IMAGE ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledStateImage", MAP, DISABLED_STATE_IMAGE ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedColor", VECTOR4, UNSELECTED_COLOR ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedColor", VECTOR4, SELECTED_COLOR ) // Deprecated property +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label", MAP, LABEL ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelText", STRING, LABEL_TEXT ) // Deprecated property +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedVisual", MAP, UNSELECTED_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "selectedVisual", MAP, SELECTED_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedVisual", MAP, DISABLED_SELECTED_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedVisual", MAP, DISABLED_UNSELECTED_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedBackgroundVisual", MAP, UNSELECTED_BACKGROUND_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "selectedBackgroundVisual", MAP, SELECTED_BACKGROUND_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedBackgroundVisual", MAP, DISABLED_UNSELECTED_BACKGROUND_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedBackgroundVisual", MAP, DISABLED_SELECTED_BACKGROUND_VISUAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "labelRelativeAlignment", STRING, LABEL_RELATIVE_ALIGNMENT ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "labelPadding", VECTOR4, LABEL_PADDING ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, Button, "visualPadding", VECTOR4, VISUAL_PADDING ) + +// 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, "state-changed", SIGNAL_STATE_CHANGED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "stateChanged", SIGNAL_STATE_CHANGED ) -DALI_ACTION_REGISTRATION( Toolkit, Button, "button-click", ACTION_BUTTON_CLICK ) +// Actions: +DALI_ACTION_REGISTRATION( Toolkit, Button, "buttonClick", ACTION_BUTTON_CLICK ) DALI_TYPE_REGISTRATION_END() -const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f ); -const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f ); - -const char* const STYLE_BUTTON_LABEL = "button.label"; - -} // unnamed namespace +DALI_ENUM_TO_STRING_TABLE_BEGIN( ALIGNMENT ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Internal::Button, BEGIN ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Internal::Button, END ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Internal::Button, TOP ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Internal::Button, BOTTOM ) +DALI_ENUM_TO_STRING_TABLE_END( ALIGNMENT ) -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 ), - mSelected( false ), - mInitialAutoRepeatingDelay( INITIAL_AUTOREPEATING_DELAY ), - mNextAutoRepeatingDelay( NEXT_AUTOREPEATING_DELAY ), - mAnimationTime( 0.0f ), - mClickActionPerforming( false ), - mState( ButtonUp ), - mPaintState( UnselectedState ) +const Scripting::StringEnum ALIGNMENT_STRING_TABLE[] = { -} + { "BEGIN", Button::BEGIN }, + { "END", Button::END }, + { "TOP", Button::TOP }, + { "BOTTOM", Button::BOTTOM }, +}; -Button::~Button() -{ -} +const unsigned int ALIGNMENT_STRING_TABLE_COUNT = sizeof( ALIGNMENT_STRING_TABLE ) / sizeof( ALIGNMENT_STRING_TABLE[0] ); -void Button::SetDisabled( bool disabled ) +const Property::Index GET_VISUAL_INDEX_FOR_STATE[][Button::STATE_COUNT] = { - if( disabled == mDisabled ) - { - return; - } - - StopTransitionAnimation(); + { Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::UNSELECTED_VISUAL }, + { Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::SELECTED_VISUAL }, + { Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL }, + { Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL } +}; - mDisabled = disabled; - - // Notifies the derived class the button has been disabled. - OnDisabled(); - - switch( mPaintState ) +/** + * Checks if given map contains a text string + */ +bool MapContainsTextString( Property::Map& map ) +{ + bool result = false; + Property::Value* value = map.Find( Toolkit::TextVisual::Property::TEXT ); + if ( value ) { - 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: + std::string textString; + value->Get( textString ); + if ( !textString.empty() ) { - //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; + result = true; } } + return result; +} + +} // unnamed namespace - StartTransitionAnimation(); +Button::Button() +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mAutoRepeatingTimer(), + mTextLabelAlignment( END ), + mAutoRepeating( false ), + mTogglableButton( false ), + mTextStringSetFlag( false ), + mInitialAutoRepeatingDelay( 0.0f ), + mNextAutoRepeatingDelay( 0.0f ), + mAnimationTime( 0.0f ), + mButtonPressedState( UNPRESSED ), + mButtonState( UNSELECTED_STATE ), + mPreviousButtonState( mButtonState ), + mClickActionPerforming( false ) +{ } -bool Button::IsDisabled() const +Button::~Button() { - return mDisabled; } void Button::SetAutoRepeating( bool autoRepeating ) { mAutoRepeating = autoRepeating; - // An autorepeating button can't be a togglable button. + // An autorepeating button can't be a toggle button. if( autoRepeating ) { - mTogglableButton = false; - - if( mSelected ) + if( IsSelected() ) { - // Emit a signal is not wanted, only change the appearance. - SetSelected( false, false ); + SetSelected( false ); // UnSelect before switching off Toggle feature. } + mTogglableButton = false; } } @@ -284,7 +193,7 @@ bool Button::IsAutoRepeating() const void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay ) { - DALI_ASSERT_ALWAYS( initialAutoRepeatingDelay > 0.f ); + DALI_ASSERT_DEBUG( initialAutoRepeatingDelay > 0.f ); mInitialAutoRepeatingDelay = initialAutoRepeatingDelay; } @@ -295,7 +204,7 @@ float Button::GetInitialAutoRepeatingDelay() const void Button::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay ) { - DALI_ASSERT_ALWAYS( nextAutoRepeatingDelay > 0.f ); + DALI_ASSERT_DEBUG( nextAutoRepeatingDelay > 0.f ); mNextAutoRepeatingDelay = nextAutoRepeatingDelay; } @@ -308,7 +217,7 @@ void Button::SetTogglableButton( bool togglable ) { mTogglableButton = togglable; - // A togglable button can't be an autorepeating button. + // A toggle button can't be an autorepeating button. if( togglable ) { mAutoRepeating = false; @@ -322,475 +231,247 @@ bool Button::IsTogglableButton() const void Button::SetSelected( bool selected ) { - if( !mDisabled && mTogglableButton && ( selected != mSelected ) ) + if( mTogglableButton ) { - SetSelected( selected, true ); - } -} - -void Button::SetSelected( bool selected, bool emitSignal ) -{ - StopTransitionAnimation(); - - mSelected = selected; - - // Notifies the derived class the button has been selected. - OnSelected(); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetSelected (%s)\n", (selected?"true":"false") ); - 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: + if ( selected && ( mButtonState != SELECTED_STATE ) ) { - //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; + ChangeState( SELECTED_STATE ); } - case DisabledUnselectedState: - case DisabledSelectedState: + else if ( !selected && ( mButtonState != UNSELECTED_STATE ) ) { - DALI_ASSERT_DEBUG( 0 && "Shouldn't be able to change paint state if the button is disabled." ); - break; + ChangeState( UNSELECTED_STATE ); } } - - StartTransitionAnimation(); - - if( emitSignal ) - { - Toolkit::Button handle( GetOwner() ); - - // Emit signal. - mStateChangedSignal.Emit( handle ); - } - - RelayoutRequest(); -} - -bool Button::IsSelected() const -{ - return mTogglableButton && mSelected; -} - -void Button::SetAnimationTime( float animationTime ) -{ - mAnimationTime = animationTime; } -float Button::GetAnimationTime() const +void Button::SetDisabled( bool disabled ) { - return mAnimationTime; -} + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetDisabled(%s) state(%d)\n", (disabled)?"disabled":"active", mButtonState ); -void Button::SetLabelText( const std::string& label ) -{ - if( !mLabel || ( label != GetLabelText() ) ) + if ( disabled ) { - // If we have a label, unparent and update it. - if( mLabel ) + if ( mButtonState == SELECTED_STATE ) { - mLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, label ); + ChangeState( DISABLED_SELECTED_STATE ); } - else + else if ( mButtonState == UNSELECTED_STATE ) { - // If we don't have a label, create one and set it up. - mLabel = Toolkit::TextLabel::New( label ); - mLabel.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_LABEL ); - mLabel.SetPosition( 0.f, 0.f ); - // label should be the top of the button - Self().Add( mLabel ); + ChangeState( DISABLED_UNSELECTED_STATE ); } - - OnLabelSet( false ); - - RelayoutRequest(); } -} - -std::string Button::GetLabelText() const -{ - Toolkit::TextLabel label = Dali::Toolkit::TextLabel::DownCast( mLabel ); - if( label ) - { - return label.GetProperty( Dali::Toolkit::TextLabel::Property::TEXT ); - } - return std::string(); -} - -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::GetDecoration( DecorationState state ) -{ - return mDecoration[ state ]; -} - -void Button::SetupContent( Actor& actorToModify, Actor newActor ) -{ - if( newActor ) + else { - StopTransitionAnimation(); - - if( actorToModify && actorToModify.GetParent() ) + if ( mButtonState == DISABLED_SELECTED_STATE ) { - actorToModify.Unparent(); + ChangeState( SELECTED_STATE ); } - - actorToModify = newActor; - - if( actorToModify ) + else if ( mButtonState == DISABLED_UNSELECTED_STATE ) { - actorToModify.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - actorToModify.SetParentOrigin( ParentOrigin::TOP_LEFT ); - actorToModify.SetPosition( 0.f, 0.f ); + ChangeState( UNSELECTED_STATE ); } - - ResetImageLayers(); - } -} - -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. - SetupContent( mUnselectedContent, CreateSolidColorActor( mUnselectedColor ) ); - mUnselectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); } } -const Vector4 Button::GetUnselectedColor() const +bool Button::IsDisabled() const { - return mUnselectedColor; + return ( mButtonState == DISABLED_SELECTED_STATE || mButtonState == DISABLED_UNSELECTED_STATE ) ; } -void Button::SetSelectedColor( const Vector4& color ) +bool Button::ValidateState( State requestedState ) { - mSelectedColor = color; + /* Below tables shows allowed state transitions + * Match rows in first column to following columns, if true then transition allowed. + * eg UNSELECTED_STATE to DISABLED_UNSELECTED_STATE is true so state transition allowed. + * + to| UNSELECTED_STATE | SELECTED_STATE | DISABLED_UNSELECTED_STATE | DISABLED_SELECTED_STATE |*/ + /* from*/ + bool transitionTable[4][4] = { /* UNSELECTED_STATE*/ { false, true, true, false }, + /* SELECTED_STATE*/ { true, false, false, true }, + /* DISABLED_UNSELECTED_STATE*/{ true, true, false, false }, + /* DISABLED_SELECTED_STATE*/ { false, true, false, false } + }; - 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. - SetupContent( mSelectedContent, CreateSolidColorActor( mSelectedColor ) ); - mSelectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - } -} + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ValidateState ReuestedState:%d, CurrentState:%d, result:%s\n", + requestedState, mButtonState, (transitionTable[mButtonState][requestedState])?"change-accepted":"change-denied"); -const Vector4 Button::GetSelectedColor() const -{ - return mSelectedColor; + return transitionTable[mButtonState][requestedState]; } -void Button::SetUnselectedImage( const std::string& filename ) +void Button::PerformFunctionOnVisualsInState( void(Button::*functionPtr)( Property::Index visualIndex), State state ) { - ImageActor newContent; - if( !filename.empty() ) - { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - newContent = ImageActor::New( resourceimage ); - } - } - else - { - newContent = ImageActor::New(); - } - - if( newContent ) - { - SetupContent( mUnselectedContent, newContent ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::PerformFunctionOnVisualsInState BACKROUND visual(%d) for state (%d)\n", + GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND], state ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::PerformFunctionOnVisualsInState FOREGROUND visuals(%d) for state (%d)\n", + GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND], state ); - mUnselectedContent.SetColor( mUnselectedColor ); + (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] ); + (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] ); - OnUnselectedImageSet(); - RelayoutRequest(); - } + RelayoutRequest(); } -Actor& Button::GetUnselectedImage() +void Button::ChangeState( State requestedState ) { - return mUnselectedContent; -} + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d)\n", requestedState ); -void Button::SetSelectedImage( const std::string& filename ) -{ - ImageActor newContent; - if( !filename.empty() ) - { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - newContent = ImageActor::New( resourceimage ); - } - } - else + // Validate State before changing + if ( !ValidateState( requestedState )) { - newContent = ImageActor::New(); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d) not validated\n", requestedState ); + return; } - if( newContent ) - { - SetupContent( mSelectedContent, newContent ); - - mSelectedContent.SetColor( mSelectedColor ); + // If not on stage the button could have still been set to selected so update state + mPreviousButtonState = mButtonState; // Store previous state for visual removal (used when animations ended) + mButtonState = requestedState; // Update current state - OnSelectedImageSet(); - RelayoutRequest(); + if ( Self().OnStage() ) + { + OnStateChange( mButtonState ); // Notify derived buttons + PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState ); + // If animation supported then visual removal should be performed after any transition animation has completed. + // If Required Visual is not loaded before current visual is removed then a flickering will be evident. + PerformFunctionOnVisualsInState( &Button::OnButtonVisualRemoval, mPreviousButtonState ); // Derived button can override OnButtonVisualRemoval } -} -Actor& Button::GetSelectedImage() -{ - return mSelectedContent; + Toolkit::Button handle( GetOwner() ); + // Emit signal. + mStateChangedSignal.Emit( handle ); } -void Button::SetBackgroundImage( const std::string& filename ) +bool Button::IsSelected() const { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mBackgroundContent, ImageActor::New( resourceimage ) ); - - OnBackgroundImageSet(); - RelayoutRequest(); - } + bool selected = ( mButtonState == SELECTED_STATE ) || ( mButtonState == DISABLED_SELECTED_STATE ); + return mTogglableButton && selected; } -Actor& Button::GetBackgroundImage() +void Button::SetLabelText( const std::string& label ) { - return mBackgroundContent; + Self().SetProperty( Toolkit::Button::Property::LABEL, label ); } -void Button::SetSelectedBackgroundImage( const std::string& filename ) +std::string Button::GetLabelText() const { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mSelectedBackgroundContent, ImageActor::New( resourceimage ) ); + Property::Value value = Self().GetProperty( Toolkit::Button::Property::LABEL ); - OnSelectedBackgroundImageSet(); - RelayoutRequest(); - } -} + Property::Map *labelProperty = value.GetMap(); -Actor& Button::GetSelectedBackgroundImage() -{ - return mSelectedBackgroundContent; -} + std::string textLabel; -void Button::SetDisabledImage( const std::string& filename ) -{ - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) + if ( labelProperty ) { - SetupContent( mDisabledContent, ImageActor::New( resourceimage ) ); - - OnDisabledImageSet(); - RelayoutRequest(); + Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT ); + value->Get( textLabel ); } -} -Actor& Button::GetDisabledImage() -{ - return mDisabledContent; + return textLabel; } -void Button::SetDisabledSelectedImage( const std::string& filename ) +void Button::MergeWithExistingLabelProperties( const Property::Map& inMap, Property::Map& outMap ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mDisabledSelectedContent, ImageActor::New( resourceimage ) ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties with %d properties\n", inMap.Count() ); - OnDisabledSelectedImageSet(); - RelayoutRequest(); + /** + * Properties for the Label visual could be from a style sheet but after being set the "TEXT" property could be set. + * Hence would need to create the Text Visual with the complete merged set of properties. + * + * 1) Find Label Visual + * 2) Retrieve current properties ( settings ) + * 3) Merge with new properties ( settings ) + * 4) Return new merged map + */ + Toolkit::Visual::Base visual = GetVisual( Toolkit::Button::Property::LABEL ); + if ( visual ) + { + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties Visual already exists, retrieving existing map\n"); + visual.CreatePropertyMap( outMap ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties retrieved %d properties\n", outMap.Count() ); } -} -Actor& Button::GetDisabledSelectedImage() -{ - return mDisabledSelectedContent; -} + outMap.Merge( inMap ); -void Button::SetDisabledBackgroundImage( const std::string& filename ) -{ - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mDisabledBackgroundContent, ImageActor::New( resourceimage ) ); + // Store if a text string has been supplied. - OnDisabledBackgroundImageSet(); - RelayoutRequest(); - } -} + mTextStringSetFlag = MapContainsTextString( outMap ); -Actor& Button::GetDisabledBackgroundImage() -{ - return mDisabledBackgroundContent; + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties now has %d properties\n", outMap.Count() ); } -std::string Button::GetUnselectedImageFilename() const +void Button::SetLabelAlignment( Button::Align labelAlignment) { - if( mUnselectedContent ) - { - ResourceImage image = ResourceImage::DownCast( mUnselectedContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); + mTextLabelAlignment = labelAlignment; + RelayoutRequest(); } -std::string Button::GetSelectedImageFilename() const +Button::Align Button::GetLabelAlignment() { - if( mSelectedContent ) - { - ResourceImage image = ResourceImage::DownCast( mSelectedContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); + return mTextLabelAlignment; } -std::string Button::GetBackgroundImageFilename() const +/** + * Create Visual for given index from a property map or url. + * 1) Check if value passed in is a url and create visual + * 2) Create visual from map if step (1) is false + * 3) Register visual with control with false for enable flag. Button will later enable visual when needed ( Button::SelectRequiredVisual ) + * 4) Unregister visual if empty map was provided. This is the method to remove a visual + */ + +void Button::CreateVisualsForComponent( Property::Index index, const Property::Value& value, const float visualDepth ) { - if( mBackgroundContent ) + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent index(%d)\n", index ); + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); + Toolkit::Visual::Base buttonVisual; + + std::string imageUrl; + if( value.Get( imageUrl ) ) { - ResourceImage image = ResourceImage::DownCast( mBackgroundContent ); - if( image ) + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent Using image URL(%d)\n", index ); + if ( !imageUrl.empty() ) { - return image.GetUrl(); + DALI_ASSERT_DEBUG( index != Toolkit::Button::Property::LABEL && "Creating a Image Visual instead of Text Visual " ); + buttonVisual = visualFactory.CreateVisual( imageUrl, ImageDimensions() ); } } - return std::string(); -} - -std::string Button::GetSelectedBackgroundImageFilename() const -{ - if( mSelectedBackgroundContent ) + else { - ResourceImage image = ResourceImage::DownCast( mSelectedBackgroundContent ); - if( image ) + // if its not a string then get a Property::Map from the property if possible. + Property::Map *map = value.GetMap(); + if( map && !map->Empty() ) // Empty map results in current visual removal. { - return image.GetUrl(); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent Using Map(%d)\n", index ); + buttonVisual = visualFactory.CreateVisual( *map ); } } - return std::string(); -} -std::string Button::GetDisabledImageFilename() const -{ - if( mDisabledContent ) + if ( buttonVisual ) { - ResourceImage image = ResourceImage::DownCast( mDisabledContent ); - if( image ) - { - return image.GetUrl(); - } + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent RegisterVisual index(%d) enabled(%s)\n", + index, IsVisualEnabled( index )?"true":"false" ); + buttonVisual.SetDepthIndex( visualDepth ); + RegisterVisual( index, buttonVisual, IsVisualEnabled( index ) ); } - return std::string(); -} - -std::string Button::GetDisabledSelectedImageFilename() const -{ - if( mDisabledSelectedContent ) + else { - ResourceImage image = ResourceImage::DownCast( mDisabledSelectedContent ); - if( image ) - { - return image.GetUrl(); - } + UnregisterVisual( index ); + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "CreateVisualsForComponent Visual not created or empty map (clearing visual).(%d)\n", index); } - return std::string(); + PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState ); } -std::string Button::GetDisabledBackgroundImageFilename() const +bool Button::GetPropertyMapForVisual( Property::Index visualIndex, Property::Map& retreivedMap ) const { - if( mDisabledBackgroundContent ) + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetPropertyMapForVisual visual(%d)\n", visualIndex); + bool success = false; + Toolkit::Visual::Base visual = GetVisual( visualIndex ); + if ( visual ) { - ResourceImage image = ResourceImage::DownCast( mDisabledBackgroundContent ); - if( image ) - { - return image.GetUrl(); - } + visual.CreatePropertyMap( retreivedMap ); + success = true; } - return std::string(); + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetPropertyMapForVisual %s\n", success?"Success":"Failure"); + return success; } bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) @@ -801,7 +482,7 @@ bool Button::DoAction( BaseObject* object, const std::string& actionName, const Toolkit::Button button = Toolkit::Button::DownCast( handle ); - DALI_ASSERT_ALWAYS( button ); + DALI_ASSERT_DEBUG( button ); if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) ) { @@ -818,9 +499,12 @@ bool Button::DoClickAction( const Property::Map& attributes ) if( !mClickActionPerforming ) { mClickActionPerforming = true; - OnButtonDown(); - mState = ButtonDown; - OnButtonUp(); + ButtonDown(); + if ( !mTogglableButton ) + { + mButtonPressedState = DEPRESSED; + } + ButtonUp(); mClickActionPerforming = false; return true; @@ -829,31 +513,27 @@ bool Button::DoClickAction( const Property::Map& attributes ) return false; } -void Button::OnButtonStageDisconnection() +void Button::ButtonDown() { - if( ButtonDown == mState ) + if( mTogglableButton ) { - if( !mTogglableButton ) + if ( mButtonState != SELECTED_STATE ) { - Released(); - - if( mAutoRepeating ) - { - mAutoRepeatingTimer.Reset(); - } + SetSelected( true ); + mButtonPressedState = TOGGLE_DEPRESSED; + } + else + { + mButtonPressedState = DEPRESSED; } } -} - -void Button::OnButtonDown() -{ - if( !mTogglableButton ) + else { Pressed(); - + mButtonPressedState = DEPRESSED; if( mAutoRepeating ) { - SetUpTimer( mInitialAutoRepeatingDelay ); + SetUpTimer( mInitialAutoRepeatingDelay ); } } @@ -862,24 +542,33 @@ void Button::OnButtonDown() mPressedSignal.Emit( handle ); } -void Button::OnButtonUp() +void Button::ButtonUp() { - if( ButtonDown == mState ) + bool emitSignalsForPressAndReleaseAction = false; + + if( DEPRESSED == mButtonPressedState ) { - if( mTogglableButton ) + if( mTogglableButton ) // Button up will change state { - SetSelected( !mSelected ); + emitSignalsForPressAndReleaseAction = OnToggleReleased(); // Derived toggle buttons can override this to provide custom behaviour } else { - Released(); - + Released(); // Button up will result in unselected state if( mAutoRepeating ) { mAutoRepeatingTimer.Reset(); } + emitSignalsForPressAndReleaseAction = true; } + } + else if ( TOGGLE_DEPRESSED == mButtonPressedState ) + { + emitSignalsForPressAndReleaseAction = true; // toggle released after being pressed, a click + } + if ( emitSignalsForPressAndReleaseAction ) + { // The clicked and released signals should be emitted regardless of toggle mode. Toolkit::Button handle( GetOwner() ); mReleasedSignal.Emit( handle ); @@ -887,9 +576,17 @@ void Button::OnButtonUp() } } +bool Button::OnToggleReleased() +{ + SetSelected( !IsSelected() ); + mButtonPressedState = UNPRESSED; + return true; +} + + void Button::OnTouchPointLeave() { - if( ButtonDown == mState ) + if( DEPRESSED == mButtonPressedState ) { if( !mTogglableButton ) { @@ -901,6 +598,8 @@ void Button::OnTouchPointLeave() } } + mButtonPressedState = UNPRESSED; + // The released signal should be emitted regardless of toggle mode. Toolkit::Button handle( GetOwner() ); mReleasedSignal.Emit( handle ); @@ -964,88 +663,75 @@ bool Button::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr return connected; } -bool Button::OnTouchEvent(const TouchEvent& event) +void Button::OnInitialize() { + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnInitialize\n" ); + + Actor self = Self(); + + mTapDetector = TapGestureDetector::New(); + mTapDetector.Attach( self ); + mTapDetector.DetectedSignal().Connect(this, &Button::OnTap); + + self.SetKeyboardFocusable( true ); + + self.TouchSignal().Connect( this, &Button::OnTouch ); +} + +bool Button::OnAccessibilityActivated() +{ + return OnKeyboardEnter(); +} + +bool Button::OnTouch( Actor actor, const TouchData& touch ) +{ + // Only events are processed when the button is not disabled and the touch event has only // one touch point. - if( ( !mDisabled ) && ( 1 == event.GetPointCount() ) ) + + if( !IsDisabled() && ( 1 == touch.GetPointCount() ) ) { - switch( event.GetPoint(0).state ) + switch( touch.GetState( 0 ) ) { - case TouchPoint::Down: + case PointState::DOWN: { - OnButtonDown(); // Notification for derived classes. - - // Sets the button state to ButtonDown. - mState = ButtonDown; + ButtonDown(); break; } - case TouchPoint::Up: + case PointState::UP: { - OnButtonUp(); // Notification for derived classes. - - // Sets the button state to ButtonUp. - mState = ButtonUp; + ButtonUp(); break; } - case TouchPoint::Interrupted: + case PointState::INTERRUPTED: { - OnTouchPointInterrupted(); // Notification for derived classes. - - // Sets the button state to the default (ButtonUp). - mState = ButtonUp; + OnTouchPointInterrupted(); break; } - case TouchPoint::Leave: + case PointState::LEAVE: { - OnTouchPointLeave(); // Notification for derived classes. - - // Sets the button state to the default (ButtonUp). - mState = ButtonUp; + OnTouchPointLeave(); break; } - case TouchPoint::Motion: - case TouchPoint::Stationary: // FALLTHROUGH + case PointState::MOTION: + case PointState::STATIONARY: // FALLTHROUGH { // Nothing to do break; } - default: - { - DALI_ASSERT_ALWAYS( !"Point status unhandled." ); - break; - } } } - else if( 1 < event.GetPointCount() ) + else if( 1 < touch.GetPointCount() ) { OnTouchPointLeave(); // Notification for derived classes. - // Sets the button state to the default (ButtonUp). - mState = ButtonUp; + // Sets the button state to the default + mButtonPressedState = UNPRESSED; } return false; } -void Button::OnInitialize() -{ - Actor self = Self(); - - mTapDetector = TapGestureDetector::New(); - mTapDetector.Attach( self ); - mTapDetector.DetectedSignal().Connect(this, &Button::OnTap); - - OnButtonInitialize(); - - self.SetKeyboardFocusable( true ); -} - -bool Button::OnAccessibilityActivated() -{ - return OnKeyboardEnter(); -} - bool Button::OnKeyboardEnter() { // When the enter key is pressed, or button is activated, the click action is performed. @@ -1055,344 +741,390 @@ bool Button::OnKeyboardEnter() return ret; } -void Button::OnControlStageDisconnection() +void Button::OnStageDisconnection() { - OnButtonStageDisconnection(); // Notification for derived classes. - mState = ButtonUp; -} + if( DEPRESSED == mButtonPressedState ) + { + if( !mTogglableButton ) + { + Released(); -void Button::OnTap(Actor actor, const TapGesture& tap) -{ - // Do nothing. + if( mAutoRepeating ) + { + mAutoRepeatingTimer.Reset(); + } + } + } + + mButtonPressedState = UNPRESSED; + + Control::OnStageDisconnection(); // Visuals will be set off stage } -void Button::SetUpTimer( float delay ) +void Button::OnStageConnection( int depth ) { - mAutoRepeatingTimer = Dali::Timer::New( static_cast( 1000.f * delay ) ); - mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot ); - mAutoRepeatingTimer.Start(); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnStageConnection ptr(%p) \n", this ); + PerformFunctionOnVisualsInState( &Button::OnButtonVisualRemoval, mPreviousButtonState ); + SelectRequiredVisual( Toolkit::Button::Property::LABEL ); + PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState ); + Control::OnStageConnection( depth ); // Enabled visuals will be put on stage } -bool Button::AutoRepeatingSlot() +Vector3 Button::GetNaturalSize() { - bool consumed = false; - if( !mDisabled ) + Vector3 size = Vector3::ZERO; + + bool horizontalAlignment = mTextLabelAlignment == BEGIN || mTextLabelAlignment == END; // label and visual side by side + + // Get natural size of foreground ( largest of the possible visuals ) + Size largestProvidedVisual; + Size labelSize = Size::ZERO; + + bool foreGroundVisualUsed = false; + + for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++ ) { - // Restart the autorepeat timer. - SetUpTimer( mNextAutoRepeatingDelay ); + Toolkit::Visual::Base visual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] ); + Size visualSize; + if ( visual ) + { + visual.GetNaturalSize( visualSize ); + largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width ); + largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height ); + foreGroundVisualUsed = true; + } + } - Pressed(); + if ( !foreGroundVisualUsed ) // If foreground visual not supplied then use the background visual to calculate Natural size + { + for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++ ) + { + Toolkit::Visual::Base visual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] ); + Size visualSize; + if ( visual ) + { + visual.GetNaturalSize( visualSize ); + largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width ); + largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height ); + } + } + } - Toolkit::Button handle( GetOwner() ); + // Get horizontal padding total + if ( largestProvidedVisual.width > 0 ) // if visual exists + { + size.width += largestProvidedVisual.width + mForegroundPadding.left + mForegroundPadding.right; + } + // Get vertical padding total + if ( largestProvidedVisual.height > 0 ) + { + size.height += largestProvidedVisual.height + mForegroundPadding.top + mForegroundPadding.bottom; + } - //Emit signal. - consumed = mReleasedSignal.Emit( handle ); - consumed |= mClickedSignal.Emit( handle ); - consumed |= mPressedSignal.Emit( handle ); - } + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize visual Size(%f,%f)\n", + largestProvidedVisual.width, largestProvidedVisual.height ); - return consumed; + // Get natural size of label if text has been set + if ( mTextStringSetFlag ) + { + Toolkit::Visual::Base visual = GetVisual( Toolkit::Button::Property::LABEL ); + + if ( visual ) + { + visual.GetNaturalSize( labelSize ); + + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize labelSize(%f,%f) padding(%f,%f)\n", + labelSize.width, labelSize.height, mLabelPadding.left + mLabelPadding.right, mLabelPadding.top + mLabelPadding.bottom); + + labelSize.width += mLabelPadding.left + mLabelPadding.right; + labelSize.height += mLabelPadding.top + mLabelPadding.bottom; + + // Add label size to height or width depending on alignment position + if ( horizontalAlignment ) + { + size.width += labelSize.width; + size.height = std::max(size.height, labelSize.height ); + } + else + { + size.height += labelSize.height; + size.width = std::max(size.width, labelSize.width ); + } + } + } + + if( size.width < 1 && size.height < 1 ) + { + // if no image or label then use Control's natural size + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize Using control natural size\n"); + size = Control::GetNaturalSize(); + } + + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "Button GetNaturalSize (%f,%f)\n", size.width, size.height ); + + return size; +} + +void Button::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) +{ + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnSetResizePolicy\n"); + RelayoutRequest(); } -void Button::Pressed() +/** + * Visuals are sized and positioned in this function. + * Whilst the control has it's size negotiated it has to size it's visuals explicitly here. + */ + +void Button::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - if( mPaintState == UnselectedState ) - { - StopTransitionAnimation(); + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState ); + + Toolkit::Visual::Base currentVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND] ); + + Toolkit::Visual::Base currentBackGroundVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND] ); - // Notifies the derived class the button has been pressed. - OnPressed(); + // Sizes and padding set to zero, if not present then values will no effect calculations. + Vector2 visualPosition = Vector2::ZERO; + Vector2 labelPosition = Vector2::ZERO; + Size visualSize = Size::ZERO; + Padding foregroundVisualPadding = Padding(0.0f, 0.0f, 0.0f, 0.0f ); + Padding labelVisualPadding = Padding(0.0f, 0.0f, 0.0f, 0.0f ); - //Layer Order - //(4) mSelectedContent (Inserted) - //(3) mUnselectedContent - //(2) mSelectedBackgroundContent (Inserted) - //(1) mBackgroundContent + if ( mTextStringSetFlag ) + { + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Label padding setting padding:%f,%f,%f,%f\n", mLabelPadding.y, mLabelPadding.x, mLabelPadding.width,mLabelPadding.height ); + labelVisualPadding = mLabelPadding; + } - AddButtonImage( mBackgroundContent ); - TransitionButtonImage( mSelectedBackgroundContent ); - AddButtonImage( mUnselectedContent ); - TransitionButtonImage( mSelectedContent ); + if ( currentVisual ) + { + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Foreground Visual setting padding:%f,%f,%f,%f\n", mForegroundPadding.y, mForegroundPadding.x, mForegroundPadding.width,mForegroundPadding.height ); + currentVisual.GetNaturalSize( visualSize ); + foregroundVisualPadding = mForegroundPadding; + } - AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); - TransitionButtonImage( mDecoration[ SELECTED_DECORATION ] ); - ReAddLabel(); + Toolkit::Align::Type visualAnchorPoint = Toolkit::Align::TOP_BEGIN; - TransitionOut( mDecoration[ UNSELECTED_DECORATION ] ); - TransitionOut( mUnselectedContent ); - TransitionOut( mDisabledContent ); - TransitionOut( mDisabledSelectedContent ); - TransitionOut( mDisabledBackgroundContent ); + Vector2 visualAndPaddingSize = Vector2( ( foregroundVisualPadding.x + visualSize.width + foregroundVisualPadding.y ), + ( foregroundVisualPadding.width + visualSize.height + foregroundVisualPadding.height )); - mPaintState = SelectedState; + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout visualAndPaddingSize(%f,%f)\n", visualAndPaddingSize.width, visualAndPaddingSize.height); - StartTransitionAnimation(); - } -} + // Text Visual should take all space available after foreground visual size and all padding is considered. + // Remaining Space priority, Foreground padding, foreground visual, Text padding then Text visual. + Size remainingSpaceForText = Size::ZERO; -void Button::Released() -{ - if( mPaintState == SelectedState ) + switch ( mTextLabelAlignment ) { - StopTransitionAnimation(); + case BEGIN : + { + visualAnchorPoint = Toolkit::Align::TOP_END; + visualPosition.x = foregroundVisualPadding.right; + visualPosition.y = foregroundVisualPadding.top; - // Notifies the derived class the button has been released. - OnReleased(); + labelPosition.x = labelVisualPadding.x; + labelPosition.y = labelVisualPadding.top; - //Layer Order - //(3) mUnselectedContent (Inserted) - //(2) mSelectedContent - //(1) mBackgroundContent + remainingSpaceForText.width = size.width - visualAndPaddingSize.width - labelVisualPadding.x - labelVisualPadding.y; + remainingSpaceForText.height = size.height - labelVisualPadding.top - labelVisualPadding.bottom; + break; + } + case END : + { + visualAnchorPoint = Toolkit::Align::TOP_BEGIN; + visualPosition.x = foregroundVisualPadding.left; + visualPosition.y = foregroundVisualPadding.top; - AddButtonImage( mBackgroundContent ); - AddButtonImage( mSelectedContent ); - TransitionButtonImage( mUnselectedContent ); + labelPosition.x = visualAndPaddingSize.width + labelVisualPadding.x; + labelPosition.y = labelVisualPadding.top; - AddButtonImage( mDecoration[ SELECTED_DECORATION ] ); - TransitionButtonImage( mDecoration[ UNSELECTED_DECORATION ] ); - ReAddLabel(); + remainingSpaceForText.width = size.width - visualAndPaddingSize.width - labelVisualPadding.x - labelVisualPadding.y; + remainingSpaceForText.height = size.height - labelVisualPadding.top - labelVisualPadding.bottom; + break; + } + case TOP : + { + visualAnchorPoint = Toolkit::Align::BOTTOM_END; + visualPosition.x = foregroundVisualPadding.left; + visualPosition.y = foregroundVisualPadding.bottom; - TransitionOut( mDecoration[ SELECTED_DECORATION ] ); - TransitionOut( mSelectedContent ); - TransitionOut( mSelectedBackgroundContent ); - TransitionOut( mDisabledContent ); - TransitionOut( mDisabledSelectedContent ); - TransitionOut( mDisabledBackgroundContent ); + labelPosition.x = labelVisualPadding.left; + labelPosition.y = labelVisualPadding.top; - mPaintState = UnselectedState; + remainingSpaceForText.width = size.width - labelVisualPadding.x - labelVisualPadding.y; + remainingSpaceForText.height = size.height - visualAndPaddingSize.height - labelVisualPadding.top - labelVisualPadding.bottom; - StartTransitionAnimation(); - } -} + break; + } + case BOTTOM : + { + visualAnchorPoint = Toolkit::Align::TOP_END; + visualPosition.x = foregroundVisualPadding.left; + visualPosition.y = foregroundVisualPadding.top; -Button::ButtonState Button::GetState() -{ - return mState; -} + labelPosition.x = labelVisualPadding.left; + labelPosition.y = visualAndPaddingSize.height + labelVisualPadding.top; -Button::PaintState Button::GetPaintState() -{ - return mPaintState; -} + remainingSpaceForText.width = size.width - labelVisualPadding.x - labelVisualPadding.y; + remainingSpaceForText.height = size.height - visualAndPaddingSize.height - labelVisualPadding.top - labelVisualPadding.bottom; -void Button::PrepareAddButtonImage( Actor& actor ) -{ - if( actor ) - { - actor.Unparent(); - Self().Add( actor ); - PrepareForTranstionOut( actor ); + break; + } } -} -void Button::TransitionButtonImage( Actor& actor ) -{ - if( actor ) + if ( currentBackGroundVisual ) { - if( !actor.GetParent() ) - { - Self().Add( actor ); - } + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual background size to(%f,%f)\n", size.width, size.height); - OnTransitionIn( actor ); - } -} + Property::Map visualTransform; -void Button::AddButtonImage( Actor& actor ) -{ - if( actor ) - { - actor.Unparent(); - Self().Add( actor ); + visualTransform.Add( Toolkit::DevelVisual::Transform::Property::SIZE, size ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4( 0.0f, 0.0f, 1.0f, 1.0f) ); // Use relative size + + currentBackGroundVisual.SetTransformAndSize( visualTransform, size ); } -} -void Button::ReAddLabel() -{ - if( mLabel ) + if ( currentVisual ) { - mLabel.Unparent(); - Self().Add( mLabel ); + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual size to(%f,%f)\n", visualSize.width, visualSize.height); + + Property::Map visualTransform; + + visualTransform.Add( Toolkit::DevelVisual::Transform::Property::SIZE, visualSize ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, visualPosition ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4( 1.0f, 1.0f, 1.0f, 1.0f) ) // Use absolute size + .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN ) + .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, visualAnchorPoint ); + + currentVisual.SetTransformAndSize( visualTransform, size ); } -} -void Button::RemoveButtonImage( Actor& actor ) -{ - if( actor ) + if ( mTextStringSetFlag ) { - if( actor.GetParent() ) + Toolkit::Visual::Base textVisual = GetVisual( Toolkit::Button::Property::LABEL ); // No need to search for Label visual if no text set. + + if ( textVisual ) { - Self().Remove( actor ); - } - PrepareForTranstionIn( actor ); - } -} + if ( !currentVisual ) + { + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Only Text\n"); + labelPosition.x = labelVisualPadding.left; + labelPosition.y = labelVisualPadding.height; + } -unsigned int Button::FindChildIndex( Actor& actor ) -{ - Actor self = Self(); - unsigned int childrenNum = self.GetChildCount(); + Vector2 preSize = Vector2( static_cast< int >( remainingSpaceForText.x ), static_cast< int >( remainingSpaceForText.y )); - for( unsigned int i = 0; i < childrenNum; i++ ) - { - Actor child = self.GetChildAt( i ); - if( child == actor ) - { - return i; + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout text Size(%f,%f) text Position(%f,%f) \n", remainingSpaceForText.width, remainingSpaceForText.height, labelPosition.x, labelPosition.y); + + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout text Size -- (%f,%f) text Position(%f,%f) \n", preSize.width, preSize.height, labelPosition.x, labelPosition.y); + + + Property::Map textVisualTransform; + textVisualTransform.Add( Toolkit::DevelVisual::Transform::Property::SIZE, preSize ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, labelPosition ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4( 1.0f, 1.0f, 1.0f,1.0f ) ) // Use absolute size + .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN ) + .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, visualAnchorPoint ); + + textVisual.SetTransformAndSize( textVisualTransform, size ); } } - return childrenNum; + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout selected (%s) \n", IsSelected()?"yes":"no" ); + + DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout << \n"); } -void Button::TransitionOut( Actor actor ) +void Button::OnTap(Actor actor, const TapGesture& tap) { - OnTransitionOut( actor ); + // Prevents Parent getting a tap event } -void Button::ResetImageLayers() +void Button::SetUpTimer( float delay ) { - // Ensure that all layers are in the correct order and state according to the paint state + mAutoRepeatingTimer = Dali::Timer::New( static_cast( 1000.f * delay ) ); + mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot ); + mAutoRepeatingTimer.Start(); +} - switch( mPaintState ) +bool Button::AutoRepeatingSlot() +{ + bool consumed = false; + if( !IsDisabled() ) { - 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 ); - } + // Restart the autorepeat timer. + SetUpTimer( mNextAutoRepeatingDelay ); - PrepareAddButtonImage( mDisabledSelectedContent ? mDisabledSelectedContent : mSelectedContent ); + Pressed(); - PrepareAddButtonImage( mDecoration[ SELECTED_DECORATION ] ); - ReAddLabel(); - break; - } - } + Toolkit::Button handle( GetOwner() ); + + //Emit signal. + consumed = mReleasedSignal.Emit( handle ); + consumed = mClickedSignal.Emit( handle ); + consumed |= mPressedSignal.Emit( handle ); + } + + return consumed; } -void Button::StartTransitionAnimation() +void Button::Pressed() { - if( mTransitionAnimation ) - { - mTransitionAnimation.Play(); - } - else + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::Pressed\n" ); + + if( mButtonState == UNSELECTED_STATE ) { - ResetImageLayers(); + ChangeState( SELECTED_STATE ); + OnPressed(); // Notifies the derived class the button has been pressed. } } -void Button::StopTransitionAnimation() +void Button::Released() { - if( mTransitionAnimation ) + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::Released\n" ); + + if( mButtonState == SELECTED_STATE && !mTogglableButton ) { - mTransitionAnimation.Clear(); - mTransitionAnimation.Reset(); + ChangeState( UNSELECTED_STATE ); + OnReleased(); // // Notifies the derived class the button has been released. } + mButtonPressedState = UNPRESSED; } -Dali::Animation Button::GetTransitionAnimation() +void Button::SelectRequiredVisual( Property::Index visualIndex ) { - if( !mTransitionAnimation ) + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SelectRequiredVisual index(%d) state(%d)\n", visualIndex, mButtonState ); + + EnableVisual( visualIndex, true ); +} + +void Button::RemoveVisual( Property::Index visualIndex ) +{ + // Use OnButtonVisualRemoval if want button developer to have the option to override removal. + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::RemoveVisual index(%d) state(%d)\n", visualIndex, mButtonState ); + + Toolkit::Visual::Base visual = GetVisual( visualIndex ); + + if( visual ) { - mTransitionAnimation = Dali::Animation::New( GetAnimationTime() ); - mTransitionAnimation.FinishedSignal().Connect( this, &Button::TransitionAnimationFinished ); + EnableVisual( visualIndex, false ); } - - return mTransitionAnimation; } -void Button::TransitionAnimationFinished( Dali::Animation& source ) +void Button::OnButtonVisualRemoval( Property::Index visualIndex ) { - StopTransitionAnimation(); - ResetImageLayers(); + // Derived Buttons can over ride this to prevent default removal. + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnButtonVisualRemoval index(%d)\n", visualIndex ); + RemoveVisual( visualIndex ); } void Button::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ) { Toolkit::Button button = Toolkit::Button::DownCast( Dali::BaseHandle( object ) ); + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetProperty index[%d]\n", index ); + if ( button ) { switch ( index ) @@ -1433,39 +1165,118 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope break; } - case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: + case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: // Legacy Tizen 3.0 { - GetImplementation( button ).SetUnselectedImage( value.Get< std::string >() ); + GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); break; } - - case Toolkit::Button::Property::SELECTED_STATE_IMAGE: + case Toolkit::Button::Property::DISABLED_STATE_IMAGE: // Legacy Tizen 3.0 + { + GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); + break; + } + case Toolkit::Button::Property::SELECTED_STATE_IMAGE: // Legacy Tizen 3.0 + { + GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND ); + break; + } + case Toolkit::DevelButton::Property::UNSELECTED_VISUAL: + case Toolkit::DevelButton::Property::SELECTED_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL: { - GetImplementation( button ).SetSelectedImage( value.Get< std::string >() ); + GetImplementation( button ).CreateVisualsForComponent( index, value, DepthIndex::CONTENT ); break; } - case Toolkit::Button::Property::DISABLED_STATE_IMAGE: + case Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: { - GetImplementation( button ).SetDisabledImage( value.Get< std::string >() ); + GetImplementation( button ).CreateVisualsForComponent( index , value, DepthIndex::BACKGROUND); break; } case Toolkit::Button::Property::UNSELECTED_COLOR: { - GetImplementation( button ).SetUnselectedColor( value.Get< Vector4 >() ); + DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::UNSELECTED_COLOR instead use Button::Property::UNSELECTED_BACKGROUND_VISUAL\n", __FUNCTION__); + GetImplementation( button ).SetColor( value.Get< Vector4 >(), Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); break; } case Toolkit::Button::Property::SELECTED_COLOR: { - GetImplementation( button ).SetSelectedColor( value.Get< Vector4 >() ); + DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::SELECTED_COLOR instead use Button::Property::SELECTED_BACKGROUND_VISUAL\n", __FUNCTION__); + GetImplementation( button ).SetColor( value.Get< Vector4 >(), Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ); break; } case Toolkit::Button::Property::LABEL_TEXT: { - GetImplementation( button ).SetLabelText( value.Get< std::string >() ); + DALI_LOG_WARNING("[%s] Using deprecated Property Button::Property::LABEL_TEXT instead use Button::Property::LABEL\n", __FUNCTION__); + GetImplementation( button ).SetLabelText(value.Get< std::string >() ); + break; + } + + case Toolkit::Button::Property::LABEL: + { + Property::Map outTextVisualProperties; + std::string textString; + + if ( value.Get( textString ) ) + { + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetProperty Setting TextVisual with string[%s]\n", textString.c_str() ); + + Property::Map setPropertyMap; + setPropertyMap.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + .Add( Toolkit::TextVisual::Property::TEXT, textString ); + + GetImplementation( button ).MergeWithExistingLabelProperties( setPropertyMap, outTextVisualProperties ); + } + else + { + // Get a Property::Map from the property if possible. + Property::Map* setPropertyMap = value.GetMap(); + if( setPropertyMap ) + { + TextVisual::ConvertStringKeysToIndexKeys( *setPropertyMap ); + GetImplementation( button ).MergeWithExistingLabelProperties( *setPropertyMap, outTextVisualProperties ); + } + } + + if( !outTextVisualProperties.Empty() ) + { + GetImplementation( button ).CreateVisualsForComponent( index, outTextVisualProperties, DepthIndex::CONTENT ); + GetImplementation( button ).RelayoutRequest(); + } + break; + } + + case Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT: + { + Button::Align labelAlignment(END); + Scripting::GetEnumeration< Button::Align> ( value.Get< std::string >().c_str(), + ALIGNMENT_TABLE, ALIGNMENT_TABLE_COUNT, + labelAlignment ); + + GetImplementation( button ).SetLabelAlignment( labelAlignment ); + GetImplementation( button ).RelayoutRequest(); + break; + } + + case Toolkit::DevelButton::Property::LABEL_PADDING: + { + Vector4 padding ( value.Get< Vector4 >() ); + GetImplementation( button ).SetLabelPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + break; + } + + case Toolkit::DevelButton::Property::VISUAL_PADDING: + { + Vector4 padding ( value.Get< Vector4 >() ); + GetImplementation( button ).SetForegroundPadding( Padding( padding.x, padding.y, padding.z, padding.w ) ); + GetImplementation( button ).RelayoutRequest(); break; } } @@ -1484,7 +1295,7 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert { case Toolkit::Button::Property::DISABLED: { - value = GetImplementation( button ).mDisabled; + value = GetImplementation( button ).IsDisabled(); break; } @@ -1514,25 +1325,43 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert case Toolkit::Button::Property::SELECTED: { - value = GetImplementation( button ).mSelected; + value = GetImplementation( button ).IsSelected(); break; } case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: { - value = GetImplementation( button ).GetUnselectedImageFilename(); + value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); break; } case Toolkit::Button::Property::SELECTED_STATE_IMAGE: { - value = GetImplementation( button ).GetSelectedImageFilename(); + value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ); break; } case Toolkit::Button::Property::DISABLED_STATE_IMAGE: { - value = GetImplementation( button ).GetDisabledImageFilename(); + value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL ); + break; + } + + case Toolkit::DevelButton::Property::UNSELECTED_VISUAL: + case Toolkit::DevelButton::Property::SELECTED_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL: + case Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL: + case Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL: + case Toolkit::Button::Property::LABEL: + { + Property::Map visualProperty; + if ( GetImplementation( button ).GetPropertyMapForVisual( propertyIndex, visualProperty ) ) + { + value = visualProperty; + } break; } @@ -1553,138 +1382,242 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert value = GetImplementation( button ).GetLabelText(); break; } + + case Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT: + { + const char* alignment = Scripting::GetEnumerationName< Button::Align >( GetImplementation( button ).GetLabelAlignment(), + ALIGNMENT_STRING_TABLE, + ALIGNMENT_STRING_TABLE_COUNT ); + if( alignment ) + { + value = std::string( alignment ); + } + + break; + } + + case Toolkit::DevelButton::Property::LABEL_PADDING: + { + Padding padding = GetImplementation( button ).GetLabelPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + break; + } + + case Toolkit::DevelButton::Property::VISUAL_PADDING: + { + Padding padding = GetImplementation( button ).GetForegroundPadding(); + value = Vector4( padding.x, padding.y, padding.top, padding.bottom); + } } } return value; } -// Deprecated API +void Button::SetLabelPadding( const Padding& padding) +{ + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetLabelPadding padding(%f,%f,%f,%f)\n", padding.left, padding.right, padding.bottom, padding.top ); + mLabelPadding = Padding( padding.left, padding.right, padding.bottom, padding.top ); + RelayoutRequest(); +} -void Button::SetLabel( Actor label ) +Padding Button::GetLabelPadding() { - if( mLabel != label ) - { - if( mLabel && mLabel.GetParent() ) - { - mLabel.GetParent().Remove( mLabel ); - } + return mLabelPadding; +} - mLabel = label; - mLabel.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_LABEL ); - mLabel.SetPosition( 0.f, 0.f ); +void Button::SetForegroundPadding( const Padding& padding) +{ + DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetForegroundPadding padding(%f,%f,%f,%f)\n", padding.left, padding.right, padding.bottom, padding.top ); + mForegroundPadding = Padding( padding.left, padding.right, padding.bottom, padding.top ); + RelayoutRequest(); +} - // label should be the top of the button - Self().Add( mLabel ); +Padding Button::GetForegroundPadding() +{ + return mForegroundPadding; +} - ResetImageLayers(); - OnLabelSet( true ); +//////////////////////////////////////////////////////////////////////// +// Legacy functions from Tizen 2.4 and 3.0 - RelayoutRequest(); +// Legacy code needed whilst Color can be set by direct Property setting ( deprecated ) instead of setting a Visual +void Button::SetColor( const Vector4& color, Property::Index visualIndex ) +{ + if ( visualIndex == Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) + { + mSelectedColor = color; + } + else + { + mUnselectedColor = color; } + + Property::Map map; + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; + + CreateVisualsForComponent( visualIndex, map, DepthIndex::BACKGROUND ); } -void Button::SetButtonImage( Actor image ) +const Vector4 Button::GetUnselectedColor() const { - if( image ) - { - StopTransitionAnimation(); + return mUnselectedColor; +} - SetupContent( mUnselectedContent, image ); +const Vector4 Button::GetSelectedColor() const +{ + return mSelectedColor; +} - OnUnselectedImageSet(); - RelayoutRequest(); - } +void Button::SetAnimationTime( float animationTime ) +{ + // Used by deprecated API + mAnimationTime = animationTime; } -void Button::SetSelectedImage( Actor image ) +float Button::GetAnimationTime() const { - if( image ) - { - StopTransitionAnimation(); + // Used by deprecated API + return mAnimationTime; +} - SetupContent( mSelectedContent, image ); +void Button::SetLabel( Actor label ) +{ + if ( label ) + { + Property::Value value =""; + value = label.GetProperty(Toolkit::TextLabel::Property::TEXT); - OnSelectedImageSet(); - RelayoutRequest(); + SetLabelText( value.Get() ); } } -void Button::SetBackgroundImage( Actor image ) +void Button::SetUnselectedImage( const std::string& filename ) +{ + SetBackgroundImage( filename ); +} + +void Button::SetBackgroundImage( const std::string& filename ) { - if( image ) + if( !filename.empty() ) { - StopTransitionAnimation(); + CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); + } + else + { + UnregisterVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); + } +} - SetupContent( mBackgroundContent, image ); +void Button::SetSelectedImage( const std::string& filename ) +{ + SetSelectedBackgroundImage( filename ); +} - OnBackgroundImageSet(); - RelayoutRequest(); +void Button::SetSelectedBackgroundImage( const std::string& filename ) +{ + if( !filename.empty() ) + { + CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); + } + else + { + UnregisterVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ); } } -void Button::SetSelectedBackgroundImage( Actor image ) +void Button::SetDisabledBackgroundImage( const std::string& filename ) { - if( image ) + if( !filename.empty() ) { - StopTransitionAnimation(); - - SetupContent( mSelectedBackgroundContent, image ); - - OnSelectedBackgroundImageSet(); - RelayoutRequest(); + CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND ); } } -void Button::SetDisabledImage( Actor image ) +void Button::SetDisabledImage( const std::string& filename ) { - if( image ) + if( !filename.empty() ) { - StopTransitionAnimation(); - - SetupContent( mDisabledContent, image ); - - OnDisabledImageSet(); - RelayoutRequest(); + CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL, filename, DepthIndex::CONTENT ); } } -void Button::SetDisabledSelectedImage( Actor image ) +void Button::SetDisabledSelectedImage( const std::string& filename ) { - if( image ) + if( !filename.empty() ) { - StopTransitionAnimation(); + CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL, filename, DepthIndex::CONTENT ); + } +} - SetupContent( mDisabledSelectedContent, image ); +// Used by Deprecated Properties which don't use the Visual Property maps for setting and getting +std::string Button::GetUrlForImageVisual( const Property::Index index ) const +{ + Toolkit::Visual::Base visual = GetVisual( index ); + std::string result; - OnDisabledSelectedImageSet(); - RelayoutRequest(); + if ( visual ) + { + Dali::Property::Map retreivedMap; + visual.CreatePropertyMap( retreivedMap ); + Property::Value* value = retreivedMap.Find( Toolkit::ImageVisual::Property::URL, Property::STRING ); + if ( value ) + { + result = value->Get(); + } } + + return result; } -void Button::SetDisabledBackgroundImage( Actor image ) +// Below functions DEPRECATED_1_0.50 - Return empty Actors + +namespace { - if( image ) - { - StopTransitionAnimation(); +std::string GetUrlFromImage( Image& image ) +{ + ResourceImage resourceImage = ResourceImage::DownCast( image ); - SetupContent( mDisabledBackgroundContent, image ); + std::string imageUrl; - OnDisabledBackgroundImageSet(); - RelayoutRequest(); + if ( resourceImage ) + { + imageUrl = resourceImage.GetUrl(); } + return imageUrl; +} + +} // namespace + + +void Button::SetButtonImage( Image image ) +{ + DALI_LOG_WARNING("Button::SetButtonImage @DEPRECATED_1_0.50\n"); + SetUnselectedImage( GetUrlFromImage( image ) ); +} + +void Button::SetSelectedImage( Image image ) +{ + DALI_LOG_WARNING("Button::SetSelectedImage @DEPRECATED_1_0.50\n"); + SetSelectedImage( GetUrlFromImage( image ) ); } Actor Button::GetButtonImage() const { - return mUnselectedContent; + DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n"); + Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ) ); + + return imageView; } Actor Button::GetSelectedImage() const { - return mSelectedContent; -} + DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n"); + Actor imageView = Toolkit::ImageView::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) ); + return imageView; +} } // namespace Internal