/*
- * 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.
// EXTERNAL INCLUDES
#include <cstring> // for strcmp
+#include <dali/devel-api/scripting/enum-helper.h>
+#include <dali/integration-api/debug.h>
#include <dali/public-api/events/touch-data.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-
-/**
- * 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 <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+
+#if defined(DEBUG_ENABLED)
+ Debug::Filter* gLogButtonFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_BUTTON_CONTROL");
+#endif
namespace Dali
{
}
// 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, "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 )
+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_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedVisual", MAP, UNSELECTED_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedVisual", MAP, SELECTED_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedVisual", MAP, DISABLED_SELECTED_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedVisual", MAP, DISABLED_UNSELECTED_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedBackgroundVisual", MAP, UNSELECTED_BACKGROUND_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedBackgroundVisual", MAP, SELECTED_BACKGROUND_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledUnselectedBackgroundVisual", MAP, DISABLED_UNSELECTED_BACKGROUND_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledSelectedBackgroundVisual", MAP, DISABLED_SELECTED_BACKGROUND_VISUAL )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelRelativeAlignment", STRING, LABEL_RELATIVE_ALIGNMENT )
// Signals:
DALI_SIGNAL_REGISTRATION( Toolkit, Button, "pressed", SIGNAL_PRESSED )
DALI_TYPE_REGISTRATION_END()
-const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f );
-const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f );
-
-} // 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_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();
-
- mDisabled = disabled;
-
- // Notifies the derived class the button has been disabled.
- OnDisabled();
+ { Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::UNSELECTED_VISUAL },
+ { Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::SELECTED_VISUAL },
+ { Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL },
+ { Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, Toolkit::Button::Property::DISABLED_SELECTED_VISUAL }
+};
- 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:
- {
- //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:
+ std::string textString;
+ value->Get( textString );
+ if ( !textString.empty() )
{
- //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;
}
}
void Button::SetInitialAutoRepeatingDelay( float initialAutoRepeatingDelay )
{
- DALI_ASSERT_ALWAYS( initialAutoRepeatingDelay > 0.f );
+ DALI_ASSERT_DEBUG( initialAutoRepeatingDelay > 0.f );
mInitialAutoRepeatingDelay = initialAutoRepeatingDelay;
}
void Button::SetNextAutoRepeatingDelay( float nextAutoRepeatingDelay )
{
- DALI_ASSERT_ALWAYS( nextAutoRepeatingDelay > 0.f );
+ DALI_ASSERT_DEBUG( nextAutoRepeatingDelay > 0.f );
mNextAutoRepeatingDelay = nextAutoRepeatingDelay;
}
{
mTogglableButton = togglable;
- // A togglable button can't be an autorepeating button.
+ // A toggle button can't be an autorepeating button.
if( togglable )
{
mAutoRepeating = false;
void Button::SetSelected( bool selected )
{
- if( !mDisabled && mTogglableButton && ( selected != mSelected ) )
+ if( mTogglableButton )
{
- SetSelected( selected, true );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetSelected (%s)\n", (selected?"true":"false") );
+
+ if ( selected && ( mButtonState != SELECTED_STATE ) )
+ {
+ ChangeState( SELECTED_STATE );
+ }
+ else if ( !selected && ( mButtonState != UNSELECTED_STATE ) )
+ {
+ ChangeState( UNSELECTED_STATE );
+ }
}
}
-void Button::SetSelected( bool selected, bool emitSignal )
+void Button::SetDisabled( bool disabled )
{
- StopTransitionAnimation();
-
- mSelected = selected;
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetDisabled(%s) state(%d)\n", (disabled)?"disabled":"active", mButtonState );
- // Notifies the derived class the button has been selected.
- OnSelected();
-
- switch( mPaintState )
+ if ( disabled )
{
- 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 ( 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( DISABLED_SELECTED_STATE );
}
- case DisabledUnselectedState:
- case DisabledSelectedState:
+ else if ( mButtonState == UNSELECTED_STATE )
{
- DALI_ASSERT_DEBUG( 0 && "Shouldn't be able to change paint state if the button is disabled." );
- break;
+ ChangeState( DISABLED_UNSELECTED_STATE );
}
}
-
- StartTransitionAnimation();
-
- if( emitSignal )
+ else
{
- Toolkit::Button handle( GetOwner() );
-
- // Emit signal.
- mStateChangedSignal.Emit( handle );
+ if ( mButtonState == DISABLED_SELECTED_STATE )
+ {
+ ChangeState( SELECTED_STATE );
+ }
+ else if ( mButtonState == DISABLED_UNSELECTED_STATE )
+ {
+ ChangeState( UNSELECTED_STATE );
+ }
}
-
- RelayoutRequest();
-}
-
-bool Button::IsSelected() const
-{
- return mTogglableButton && mSelected;
}
-void Button::SetAnimationTime( float animationTime )
+bool Button::IsDisabled() const
{
- mAnimationTime = animationTime;
+ return ( mButtonState == DISABLED_SELECTED_STATE || mButtonState == DISABLED_UNSELECTED_STATE ) ;
}
-float Button::GetAnimationTime() const
+bool Button::ValidateState( State requestedState )
{
- return mAnimationTime;
-}
+ /* 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 }
+ };
-void Button::SetLabelText( const std::string& label )
-{
- Property::Map labelProperty;
- labelProperty.Insert( "text", label );
- ModifyLabel( labelProperty );
-}
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ValidateState ReuestedState:%d, CurrentState:%d, result:%s\n",
+ requestedState, mButtonState, (transitionTable[mButtonState][requestedState])?"change-accepted":"change-denied");
-std::string Button::GetLabelText() const
-{
- Toolkit::TextLabel label = Dali::Toolkit::TextLabel::DownCast( mLabel );
- if( label )
- {
- return label.GetProperty<std::string>( Dali::Toolkit::TextLabel::Property::TEXT );
- }
- return std::string();
+ return transitionTable[mButtonState][requestedState];
}
-void Button::ModifyLabel( const Property::Map& properties )
+void Button::PerformFunctionOnVisualsInState( void(Button::*functionPtr)( Property::Index visualIndex), State state )
{
- // 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 )
- {
- // If the conversion worked, we have a valid property index,
- // Set the property to the new value.
- mLabel.SetProperty( setPropertyIndex, propertyPair.second );
- }
- }
+ 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 );
- // Notify derived button classes of the change.
- OnLabelSet( false );
+ (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] );
+ (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] );
RelayoutRequest();
}
-Actor& Button::GetLabelActor()
+void Button::ChangeState( State requestedState )
{
- return mLabel;
-}
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d)\n", requestedState );
-void Button::SetDecoration( DecorationState state, Actor actor )
-{
- if( mDecoration[ state ] && mDecoration[ state ].GetParent() )
+ // Validate State before changing
+ if ( !ValidateState( requestedState ))
{
- mDecoration[ state ].Unparent();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d) not validated\n", requestedState );
+ return;
}
- mDecoration[ state ] = actor;
- mDecoration[ state ].SetColorMode( USE_OWN_COLOR );
+ // 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
- ResetImageLayers();
- RelayoutRequest();
-}
-
-Actor& Button::GetDecoration( DecorationState state )
-{
- return mDecoration[ state ];
-}
-
-void Button::SetupContent( Actor& actorToModify, Actor newActor )
-{
- if( newActor )
+ if ( Self().OnStage() )
{
- 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();
+ 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
}
-}
-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 );
- }
+ Toolkit::Button handle( GetOwner() );
+ // Emit signal.
+ mStateChangedSignal.Emit( handle );
}
-const Vector4 Button::GetUnselectedColor() const
+bool Button::IsSelected() const
{
- return mUnselectedColor;
+ bool selected = ( mButtonState == SELECTED_STATE ) || ( mButtonState == DISABLED_SELECTED_STATE );
+ return mTogglableButton && selected;
}
-void Button::SetSelectedColor( const Vector4& color )
+void Button::SetLabelText( const std::string& label )
{
- 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 );
- }
-}
+ Property::Map labelProperty;
+ labelProperty.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT)
+ .Add( Toolkit::TextVisual::Property::TEXT, label );
-const Vector4 Button::GetSelectedColor() const
-{
- return mSelectedColor;
+ Self().SetProperty( Toolkit::Button::Property::LABEL, labelProperty );
}
-void Button::SetUnselectedImage( const std::string& filename )
+std::string Button::GetLabelText() const
{
- Toolkit::ImageView newContent;
- if( !filename.empty() )
- {
- newContent = Toolkit::ImageView::New( filename );
- }
- else
- {
- newContent = Toolkit::ImageView::New();
- }
+ Property::Value value = Self().GetProperty( Toolkit::Button::Property::LABEL );
- if( newContent )
- {
- SetupContent( mUnselectedContent, newContent );
+ Property::Map *labelProperty = value.GetMap();
- mUnselectedContent.SetColor( mUnselectedColor );
+ std::string textLabel;
- OnUnselectedImageSet();
- RelayoutRequest();
+ if ( labelProperty )
+ {
+ Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+ value->Get( textLabel );
}
-}
-Actor& Button::GetUnselectedImage()
-{
- return mUnselectedContent;
+ return textLabel;
}
-void Button::SetSelectedImage( const std::string& filename )
+void Button::MergeLabelProperties( const Property::Map& inMap, Property::Map& outMap )
{
- Toolkit::ImageView newContent;
- if( !filename.empty() )
- {
- newContent = Toolkit::ImageView::New( filename );
- }
- else
- {
- newContent = Toolkit::ImageView::New();
- }
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties with %d properties\n", inMap.Count() );
- if( newContent )
+ /**
+ * 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 )
{
- SetupContent( mSelectedContent, newContent );
-
- mSelectedContent.SetColor( mSelectedColor );
-
- OnSelectedImageSet();
- RelayoutRequest();
+ 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::GetSelectedImage()
-{
- return mSelectedContent;
-}
-
-void Button::SetBackgroundImage( const std::string& filename )
-{
- SetupContent( mBackgroundContent, Toolkit::ImageView::New( filename ) );
-
- OnBackgroundImageSet();
- RelayoutRequest();
-}
-
-Actor& Button::GetBackgroundImage()
-{
- return mBackgroundContent;
-}
-
-void Button::SetSelectedBackgroundImage( const std::string& filename )
-{
- SetupContent( mSelectedBackgroundContent, Toolkit::ImageView::New( filename ) );
- OnSelectedBackgroundImageSet();
- RelayoutRequest();
-}
-
-Actor& Button::GetSelectedBackgroundImage()
-{
- return mSelectedBackgroundContent;
-}
+ outMap.Merge( inMap );
-void Button::SetDisabledImage( const std::string& filename )
-{
- SetupContent( mDisabledContent, Toolkit::ImageView::New( filename ) );
+ // Store if a text string has been supplied.
- OnDisabledImageSet();
- RelayoutRequest();
-}
+ mTextStringSetFlag = MapContainsTextString( outMap );
-Actor& Button::GetDisabledImage()
-{
- return mDisabledContent;
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties now has %d properties\n", outMap.Count() );
}
-void Button::SetDisabledSelectedImage( const std::string& filename )
+void Button::SetLabelAlignment( Button::Align labelAlignment)
{
- SetupContent( mDisabledSelectedContent, Toolkit::ImageView::New( filename ) );
-
- OnDisabledSelectedImageSet();
+ mTextLabelAlignment = labelAlignment;
RelayoutRequest();
}
-Actor& Button::GetDisabledSelectedImage()
+Button::Align Button::GetLabelAlignment()
{
- return mDisabledSelectedContent;
+ return mTextLabelAlignment;
}
-void Button::SetDisabledBackgroundImage( const std::string& filename )
-{
- SetupContent( mDisabledBackgroundContent, Toolkit::ImageView::New( filename ) );
-
- OnDisabledBackgroundImageSet();
- RelayoutRequest();
-}
+/**
+ * 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
+ */
-Actor& Button::GetDisabledBackgroundImage()
+void Button::CreateVisualsForComponent( Property::Index index, const Property::Value& value, const float visualDepth )
{
- return mDisabledBackgroundContent;
-}
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent index(%d)\n", index );
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base buttonVisual;
-std::string Button::GetUnselectedImageFilename() const
-{
- if( mUnselectedContent )
+ std::string imageUrl;
+ if( value.Get( imageUrl ) )
{
- ResourceImage image = ResourceImage::DownCast( mUnselectedContent );
- 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::GetSelectedImageFilename() const
-{
- if( mSelectedContent )
+ else
{
- ResourceImage image = ResourceImage::DownCast( mSelectedContent );
- 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();
+
+ if ( buttonVisual )
+ {
+ 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 ) );
+ }
+ else
+ {
+ UnregisterVisual( index );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "CreateVisualsForComponent Visual not created or empty map (clearing visual).(%d)\n", index);
+ }
+ PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState );
}
-std::string Button::GetDisabledImageFilename() const
+bool Button::GetPropertyMapForVisual( Property::Index visualIndex, Property::Map& retreivedMap ) const
{
- if( mDisabledContent )
+ 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( mDisabledContent );
- 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 )
Toolkit::Button button = Toolkit::Button::DownCast( handle );
- DALI_ASSERT_ALWAYS( button );
+ DALI_ASSERT_DEBUG( button );
if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) )
{
if( !mClickActionPerforming )
{
mClickActionPerforming = true;
- OnButtonDown();
- mState = ButtonDown;
- OnButtonUp();
+ ButtonDown();
+ if ( !mTogglableButton )
+ {
+ mButtonPressedState = DEPRESSED;
+ }
+ ButtonUp();
mClickActionPerforming = false;
return true;
return false;
}
-void Button::OnButtonDown()
+void Button::ButtonDown()
{
- if( !mTogglableButton )
+ if( mTogglableButton )
+ {
+ if ( mButtonState != SELECTED_STATE )
+ {
+ SetSelected( true );
+ mButtonPressedState = TOGGLE_DEPRESSED;
+ }
+ else
+ {
+ mButtonPressedState = DEPRESSED;
+ }
+ }
+ else
{
Pressed();
-
+ mButtonPressedState = DEPRESSED;
if( mAutoRepeating )
{
- SetUpTimer( mInitialAutoRepeatingDelay );
+ SetUpTimer( mInitialAutoRepeatingDelay );
}
}
mPressedSignal.Emit( handle );
}
-void Button::OnButtonUp()
+void Button::ButtonUp()
{
- if( ButtonDown == mState )
+ if( DEPRESSED == mButtonPressedState )
{
- if( mTogglableButton )
+ bool validButtonAction = false;
+
+ if( mTogglableButton ) // Button up will change state
{
- SetSelected( !mSelected );
+ validButtonAction = 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();
}
+ validButtonAction = true;
}
- // The clicked and released signals should be emitted regardless of toggle mode.
- Toolkit::Button handle( GetOwner() );
- mReleasedSignal.Emit( handle );
- mClickedSignal.Emit( handle );
+ if ( validButtonAction )
+ {
+ // The clicked and released signals should be emitted regardless of toggle mode.
+ Toolkit::Button handle( GetOwner() );
+ mReleasedSignal.Emit( handle );
+ mClickedSignal.Emit( handle );
+ }
}
}
+bool Button::OnToggleReleased()
+{
+ SetSelected( !IsSelected() );
+ mButtonPressedState = UNPRESSED;
+ return true;
+}
+
+
void Button::OnTouchPointLeave()
{
- if( ButtonDown == mState )
+ if( DEPRESSED == mButtonPressedState )
{
if( !mTogglableButton )
{
}
}
+ mButtonPressedState = UNPRESSED;
+
// The released signal should be emitted regardless of toggle mode.
Toolkit::Button handle( GetOwner() );
mReleasedSignal.Emit( handle );
void Button::OnInitialize()
{
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::OnInitialize\n" );
+
Actor self = Self();
mTapDetector = TapGestureDetector::New();
return OnKeyboardEnter();
}
-bool Button::OnKeyboardEnter()
+bool Button::OnTouch( Actor actor, const TouchData& touch )
{
- // When the enter key is pressed, or button is activated, the click action is performed.
- Property::Map attributes;
- bool ret = DoClickAction( attributes );
- return ret;
-}
+ // Only events are processed when the button is not disabled and the touch event has only
+ // one touch point.
-void Button::OnStageDisconnection()
-{
- if( ButtonDown == mState )
+ if( !IsDisabled() && ( 1 == touch.GetPointCount() ) )
{
- if( !mTogglableButton )
+ switch( touch.GetState( 0 ) )
{
- Released();
-
- if( mAutoRepeating )
+ case PointState::DOWN:
{
- mAutoRepeatingTimer.Reset();
- }
- }
- }
-
- mState = ButtonUp;
-
- Control::OnStageDisconnection();
-}
-
-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 == touch.GetPointCount() ) )
- {
- switch( touch.GetState( 0 ) )
- {
- case PointState::DOWN:
- {
- OnButtonDown(); // Notification for derived classes.
-
- // Sets the button state to ButtonDown.
- mState = ButtonDown;
- break;
+ ButtonDown();
+ break;
}
case PointState::UP:
{
- OnButtonUp(); // Notification for derived classes.
-
- // Sets the button state to ButtonUp.
- mState = ButtonUp;
+ ButtonUp();
break;
}
case PointState::INTERRUPTED:
{
- OnTouchPointInterrupted(); // Notification for derived classes.
-
- // Sets the button state to the default (ButtonUp).
- mState = ButtonUp;
+ OnTouchPointInterrupted();
break;
}
case PointState::LEAVE:
{
- OnTouchPointLeave(); // Notification for derived classes.
-
- // Sets the button state to the default (ButtonUp).
- mState = ButtonUp;
+ OnTouchPointLeave();
break;
}
case PointState::MOTION:
{
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::OnTap(Actor actor, const TapGesture& tap)
+bool Button::OnKeyboardEnter()
{
- // Do nothing.
-}
+ // When the enter key is pressed, or button is activated, the click action is performed.
+ Property::Map attributes;
+ bool ret = DoClickAction( attributes );
-void Button::SetUpTimer( float delay )
-{
- mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
- mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot );
- mAutoRepeatingTimer.Start();
+ return ret;
}
-bool Button::AutoRepeatingSlot()
+void Button::OnStageDisconnection()
{
- bool consumed = false;
- if( !mDisabled )
+ if( DEPRESSED == mButtonPressedState )
{
- // Restart the autorepeat timer.
- SetUpTimer( mNextAutoRepeatingDelay );
-
- Pressed();
+ if( !mTogglableButton )
+ {
+ Released();
- Toolkit::Button handle( GetOwner() );
+ if( mAutoRepeating )
+ {
+ mAutoRepeatingTimer.Reset();
+ }
+ }
+ }
- //Emit signal.
- consumed = mReleasedSignal.Emit( handle );
- consumed |= mClickedSignal.Emit( handle );
- consumed |= mPressedSignal.Emit( handle );
- }
+ mButtonPressedState = UNPRESSED;
- return consumed;
+ Control::OnStageDisconnection(); // Visuals will be set off stage
}
-void Button::Pressed()
+void Button::OnStageConnection( int depth )
{
- 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 );
+ 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
+}
- AddButtonImage( mDecoration[ UNSELECTED_DECORATION ] );
- TransitionButtonImage( mDecoration[ SELECTED_DECORATION ] );
- ReAddLabel();
+Vector3 Button::GetNaturalSize()
+{
+ Vector3 size = Vector3::ZERO;
- TransitionOut( mDecoration[ UNSELECTED_DECORATION ] );
- TransitionOut( mUnselectedContent );
- TransitionOut( mDisabledContent );
- TransitionOut( mDisabledSelectedContent );
- TransitionOut( mDisabledBackgroundContent );
+ bool horizontalAlignment = mTextLabelAlignment == BEGIN || mTextLabelAlignment == END; // label and visual side by side
- mPaintState = SelectedState;
+ // Get natural size of foreground ( largest of the possible visuals )
+ Size largestForegroundVisual;
+ Size labelSize = Size::ZERO;
- StartTransitionAnimation();
+ for ( int state = Button::UNSELECTED_STATE; state < Button::STATE_COUNT; state++)
+ {
+ Toolkit::Visual::Base visual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] );
+ Size visualSize;
+ if ( visual )
+ {
+ visual.GetNaturalSize( visualSize );
+ largestForegroundVisual.width = std::max(largestForegroundVisual.width, visualSize.width );
+ largestForegroundVisual.height = std::max(largestForegroundVisual.height, visualSize.height );
+ }
}
-}
-void Button::Released()
-{
- if( mPaintState == SelectedState )
+ // Get horizontal padding total
+ if ( largestForegroundVisual.width > 0 ) // if visual exists
+ {
+ size.width += largestForegroundVisual.width + mForegroundPadding.left + mForegroundPadding.right;
+ }
+ // Get vertical padding total
+ if ( largestForegroundVisual.height > 0 )
{
- StopTransitionAnimation();
+ size.height += largestForegroundVisual.height + mForegroundPadding.top + mForegroundPadding.bottom;
+ }
- // Notifies the derived class the button has been released.
- OnReleased();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize visual Size(%f,%f)\n",
+ largestForegroundVisual.width, largestForegroundVisual.height );
- //Layer Order
- //(3) mUnselectedContent (Inserted)
- //(2) mSelectedContent
- //(1) mBackgroundContent
+ // Get natural size of label if text has been set
+ if ( mTextStringSetFlag )
+ {
+ Toolkit::Visual::Base visual = GetVisual( Toolkit::Button::Property::LABEL );
- AddButtonImage( mBackgroundContent );
- AddButtonImage( mSelectedContent );
- TransitionButtonImage( mUnselectedContent );
+ if ( visual )
+ {
+ visual.GetNaturalSize( labelSize );
- AddButtonImage( mDecoration[ SELECTED_DECORATION ] );
- TransitionButtonImage( mDecoration[ UNSELECTED_DECORATION ] );
- ReAddLabel();
+ 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);
- TransitionOut( mDecoration[ SELECTED_DECORATION ] );
- TransitionOut( mSelectedContent );
- TransitionOut( mSelectedBackgroundContent );
- TransitionOut( mDisabledContent );
- TransitionOut( mDisabledSelectedContent );
- TransitionOut( mDisabledBackgroundContent );
+ labelSize.width += mLabelPadding.left + mLabelPadding.right;
+ labelSize.height += mLabelPadding.top + mLabelPadding.bottom;
- mPaintState = UnselectedState;
+ // 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 );
+ }
+ }
+ }
- StartTransitionAnimation();
+ 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();
}
-}
-Button::ButtonState Button::GetState()
-{
- return mState;
-}
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "Button GetNaturalSize (%f,%f)\n", size.width, size.height );
-Button::PaintState Button::GetPaintState()
-{
- return mPaintState;
+ return size;
}
-void Button::PrepareAddButtonImage( Actor& actor )
+void Button::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
{
- if( actor )
- {
- Self().Add( actor );
- PrepareForTranstionOut( actor );
- }
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnSetResizePolicy\n");
+ RelayoutRequest();
}
-void Button::TransitionButtonImage( Actor& actor )
+/**
+ * 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( actor )
- {
- if( !actor.GetParent() )
- {
- Self().Add( actor );
- }
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout targetSize(%f,%f) ptr(%p) state[%d]\n", size.width, size.height, this, mButtonState );
- OnTransitionIn( actor );
- }
-}
+ Toolkit::Visual::Base currentVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND] );
-void Button::AddButtonImage( Actor& actor )
-{
- if( actor )
- {
- Self().Add( actor );
- }
-}
+ Toolkit::Visual::Base currentBackGroundVisual = GetVisual( GET_VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND] );
-void Button::ReAddLabel()
-{
- if( mLabel )
+ // 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 );
+
+ if ( mTextStringSetFlag )
{
- mLabel.Unparent();
- Self().Add( mLabel );
+ 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;
}
-}
-void Button::RemoveButtonImage( Actor& actor )
-{
- if( actor )
+ if ( currentVisual )
{
- if( actor.GetParent() )
- {
- Self().Remove( actor );
- }
- PrepareForTranstionIn( actor );
+ 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;
}
-}
-unsigned int Button::FindChildIndex( Actor& actor )
-{
- Actor self = Self();
- unsigned int childrenNum = self.GetChildCount();
+ Toolkit::Align::Type visualAnchorPoint = Toolkit::Align::TOP_BEGIN;
- for( unsigned int i = 0; i < childrenNum; i++ )
+ Vector2 visualAndPaddingSize = Vector2( ( foregroundVisualPadding.x + visualSize.width + foregroundVisualPadding.y ),
+ ( foregroundVisualPadding.width + visualSize.height + foregroundVisualPadding.height ));
+
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout visualAndPaddingSize(%f,%f)\n", visualAndPaddingSize.width, visualAndPaddingSize.height);
+
+ // 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;
+
+ switch ( mTextLabelAlignment )
{
- Actor child = self.GetChildAt( i );
- if( child == actor )
+ case BEGIN :
{
- return i;
- }
- }
+ visualAnchorPoint = Toolkit::Align::TOP_END;
+ visualPosition.x = foregroundVisualPadding.right;
+ visualPosition.y = foregroundVisualPadding.top;
- return childrenNum;
-}
+ labelPosition.x = labelVisualPadding.x;
+ labelPosition.y = labelVisualPadding.top;
-void Button::TransitionOut( Actor actor )
-{
- OnTransitionOut( actor );
-}
+ 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;
-void Button::ResetImageLayers()
-{
- // Ensure that all layers are in the correct order and state according to the paint state
+ labelPosition.x = visualAndPaddingSize.width + labelVisualPadding.x;
+ labelPosition.y = labelVisualPadding.top;
- 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();
+ remainingSpaceForText.width = size.width - visualAndPaddingSize.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - labelVisualPadding.top - labelVisualPadding.bottom;
break;
}
- case SelectedState:
+ case TOP :
{
- //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();
+ visualAnchorPoint = Toolkit::Align::BOTTOM_END;
+ visualPosition.x = foregroundVisualPadding.left;
+ visualPosition.y = foregroundVisualPadding.bottom;
+
+ labelPosition.x = labelVisualPadding.left;
+ labelPosition.y = labelVisualPadding.top;
+
+ remainingSpaceForText.width = size.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - visualAndPaddingSize.height - labelVisualPadding.top - labelVisualPadding.bottom;
+
break;
}
- case DisabledUnselectedState:
+ case BOTTOM :
{
- //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();
+ visualAnchorPoint = Toolkit::Align::TOP_END;
+ visualPosition.x = foregroundVisualPadding.left;
+ visualPosition.y = foregroundVisualPadding.top;
+
+ labelPosition.x = labelVisualPadding.left;
+ labelPosition.y = visualAndPaddingSize.height + labelVisualPadding.top;
+
+ remainingSpaceForText.width = size.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - visualAndPaddingSize.height - labelVisualPadding.top - labelVisualPadding.bottom;
+
break;
}
- case DisabledSelectedState:
+ }
+
+ if ( currentBackGroundVisual )
+ {
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual bakcground size to(%f,%f)\n", size.width, size.height);
+
+ Property::Map visualTransform;
+
+ 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 );
+ }
+
+ if ( currentVisual )
+ {
+ 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 );
+ }
+
+ if ( mTextStringSetFlag )
+ {
+ Toolkit::Visual::Base textVisual = GetVisual( Toolkit::Button::Property::LABEL ); // No need to search for Label visual if no text set.
+
+ if ( textVisual )
{
- //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
+ if ( !currentVisual )
{
- PrepareAddButtonImage( mBackgroundContent );
- PrepareAddButtonImage( mSelectedBackgroundContent );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Only Text\n");
+ labelPosition.x = labelVisualPadding.left;
+ labelPosition.y = labelVisualPadding.height;
}
- PrepareAddButtonImage( mDisabledSelectedContent ? mDisabledSelectedContent : mSelectedContent );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout text Size(%f,%f) text Position(%f,%f) \n", remainingSpaceForText.width, remainingSpaceForText.height, labelPosition.x, labelPosition.y);
- PrepareAddButtonImage( mDecoration[ SELECTED_DECORATION ] );
- ReAddLabel();
- break;
+ Property::Map textVisualTransform;
+ textVisualTransform.Add( Toolkit::DevelVisual::Transform::Property::SIZE, remainingSpaceForText)
+ .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 );
}
}
+
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout << \n");
}
-void Button::StartTransitionAnimation()
+void Button::OnTap(Actor actor, const TapGesture& tap)
{
- if( mTransitionAnimation )
+ // Prevents Parent getting a tap event
+}
+
+void Button::SetUpTimer( float delay )
+{
+ mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
+ mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot );
+ mAutoRepeatingTimer.Start();
+}
+
+bool Button::AutoRepeatingSlot()
+{
+ bool consumed = false;
+ if( !IsDisabled() )
{
- mTransitionAnimation.Play();
- }
- else
+ // Restart the autorepeat timer.
+ SetUpTimer( mNextAutoRepeatingDelay );
+
+ Pressed();
+
+ Toolkit::Button handle( GetOwner() );
+
+ //Emit signal.
+ consumed = mReleasedSignal.Emit( handle );
+ consumed = mClickedSignal.Emit( handle );
+ consumed |= mPressedSignal.Emit( handle );
+ }
+
+ return consumed;
+}
+
+void Button::Pressed()
+{
+ 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 )
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::Button::Property::UNSELECTED_VISUAL, value, DepthIndex::CONTENT );
break;
}
-
- case Toolkit::Button::Property::SELECTED_STATE_IMAGE:
+ case Toolkit::Button::Property::DISABLED_STATE_IMAGE: // Legacy Tizen 3.0
+ {
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL, value, DepthIndex::CONTENT );
+ break;
+ }
+ case Toolkit::Button::Property::SELECTED_STATE_IMAGE: // Legacy Tizen 3.0
+ {
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::Button::Property::SELECTED_VISUAL, value, DepthIndex::CONTENT );
+ break;
+ }
+ case Toolkit::Button::Property::UNSELECTED_VISUAL:
+ case Toolkit::Button::Property::SELECTED_VISUAL:
+ case Toolkit::Button::Property::DISABLED_SELECTED_VISUAL:
+ case Toolkit::Button::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::Button::Property::UNSELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::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::Button::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::Button::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:
{
// Get a Property::Map from the property if possible.
- Property::Map setPropertyMap;
- if( value.Get( setPropertyMap ) )
+ Property::Map* setPropertyMap = value.GetMap();
+ if( setPropertyMap )
{
- GetImplementation( button ).ModifyLabel( setPropertyMap );
+ Property::Map textVisualProperties;
+ GetImplementation( button ).MergeLabelProperties( *setPropertyMap, textVisualProperties );
+ GetImplementation( button ).CreateVisualsForComponent( index, textVisualProperties, DepthIndex::CONTENT );
+ GetImplementation( button ).RelayoutRequest();
}
+ break;
+ }
+
+ case Toolkit::Button::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 );
+ break;
}
- break;
}
}
}
{
case Toolkit::Button::Property::DISABLED:
{
- value = GetImplementation( button ).mDisabled;
+ value = GetImplementation( button ).IsDisabled();
break;
}
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::Button::Property::UNSELECTED_VISUAL );
break;
}
case Toolkit::Button::Property::SELECTED_STATE_IMAGE:
{
- value = GetImplementation( button ).GetSelectedImageFilename();
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::Button::Property::SELECTED_VISUAL );
break;
}
case Toolkit::Button::Property::DISABLED_STATE_IMAGE:
{
- value = GetImplementation( button ).GetDisabledImageFilename();
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL );
+ break;
+ }
+
+ case Toolkit::Button::Property::UNSELECTED_VISUAL:
+ case Toolkit::Button::Property::SELECTED_VISUAL:
+ case Toolkit::Button::Property::DISABLED_SELECTED_VISUAL:
+ case Toolkit::Button::Property::DISABLED_UNSELECTED_VISUAL:
+ case Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL:
+ case Toolkit::Button::Property::LABEL:
+ {
+ Property::Map visualProperty;
+ if ( GetImplementation( button ).GetPropertyMapForVisual( propertyIndex, visualProperty ) )
+ {
+ value = visualProperty;
+ }
break;
}
break;
}
- case Toolkit::Button::Property::LABEL:
+ case Toolkit::Button::Property::LABEL_RELATIVE_ALIGNMENT:
{
- Property::Map emptyMap;
- value = emptyMap;
+ const char* alignment = Scripting::GetEnumerationName< Button::Align >( GetImplementation( button ).GetLabelAlignment(),
+ ALIGNMENT_STRING_TABLE,
+ ALIGNMENT_STRING_TABLE_COUNT );
+ if( alignment )
+ {
+ value = std::string( alignment );
+ }
+
break;
}
}
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.SetPosition( 0.0f, 0.0f );
+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::Button::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<std::string>() );
}
}
-void Button::SetBackgroundImage( Actor image )
+void Button::SetUnselectedImage( const std::string& filename )
{
- if( image )
+ if( !filename.empty() )
{
- StopTransitionAnimation();
-
- SetupContent( mBackgroundContent, image );
-
- OnBackgroundImageSet();
- RelayoutRequest();
+ CreateVisualsForComponent( Toolkit::Button::Property::UNSELECTED_VISUAL, filename, DepthIndex::CONTENT );
}
}
-void Button::SetSelectedBackgroundImage( Actor image )
+void Button::SetBackgroundImage( const std::string& filename )
{
- if( image )
+ if( !filename.empty() )
{
- StopTransitionAnimation();
-
- SetupContent( mSelectedBackgroundContent, image );
+ CreateVisualsForComponent( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+}
- OnSelectedBackgroundImageSet();
- RelayoutRequest();
+void Button::SetSelectedImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::Button::Property::SELECTED_VISUAL, filename, DepthIndex::CONTENT );
}
}
-void Button::SetDisabledImage( Actor image )
+void Button::SetSelectedBackgroundImage( const std::string& filename )
{
- if( image )
+ if( !filename.empty() )
{
- StopTransitionAnimation();
+ CreateVisualsForComponent( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+}
- SetupContent( mDisabledContent, image );
+void Button::SetDisabledBackgroundImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+}
- OnDisabledImageSet();
- RelayoutRequest();
+void Button::SetDisabledImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::Button::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::Button::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<std::string>();
+ }
}
+
+ 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::Button::Property::UNSELECTED_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::Button::Property::SELECTED_VISUAL ) );
+ return imageView;
+}
} // namespace Internal
projects / platform / core / uifw / dali-toolkit.git / blobdiff