/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
#include "button-impl.h"
// EXTERNAL INCLUDES
-#include <dali/public-api/events/touch-event.h>
+#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/actors/image-actor.h>
-#include <dali/public-api/scripting/scripting.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
+#include <dali/devel-api/object/property-helper-devel.h>
+#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-
-/**
- * Button states and contents
- * (3) mSelectedContent
- * (2) mButtonContent (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
- * | mButtonContent / 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/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali-toolkit/public-api/align-enumerations.h>
+#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/visuals/text/text-visual.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.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( Button, "disabled", BOOLEAN, DISABLED )
-DALI_PROPERTY_REGISTRATION( Button, "auto-repeating", BOOLEAN, AUTO_REPEATING )
-DALI_PROPERTY_REGISTRATION( Button, "initial-auto-repeating-delay", FLOAT, INITIAL_AUTO_REPEATING_DELAY )
-DALI_PROPERTY_REGISTRATION( Button, "next-auto-repeating-delay", FLOAT, NEXT_AUTO_REPEATING_DELAY )
-DALI_PROPERTY_REGISTRATION( Button, "togglable", BOOLEAN, TOGGLABLE )
-DALI_PROPERTY_REGISTRATION( Button, "selected", BOOLEAN, SELECTED )
-DALI_PROPERTY_REGISTRATION( Button, "normal-state-actor", MAP, NORMAL_STATE_ACTOR )
-DALI_PROPERTY_REGISTRATION( Button, "selected-state-actor", MAP, SELECTED_STATE_ACTOR )
-DALI_PROPERTY_REGISTRATION( Button, "disabled-state-actor", MAP, DISABLED_STATE_ACTOR )
-DALI_PROPERTY_REGISTRATION( Button, "label-actor", MAP, LABEL_ACTOR )
-
-DALI_SIGNAL_REGISTRATION( Button, "pressed", SIGNAL_PRESSED )
-DALI_SIGNAL_REGISTRATION( Button, "released", SIGNAL_RELEASED )
-DALI_SIGNAL_REGISTRATION( Button, "clicked", SIGNAL_CLICKED )
-DALI_SIGNAL_REGISTRATION( Button, "state-changed", SIGNAL_STATE_CHANGED )
-
-DALI_ACTION_REGISTRATION( Button, "button-click", ACTION_BUTTON_CLICK )
+DALI_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, "stateChanged", SIGNAL_STATE_CHANGED )
+
+// 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 );
-
-} // 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(),
- 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] );
+
+const Property::Index GET_VISUAL_INDEX_FOR_STATE[][Button::STATE_COUNT] =
{
- if( mAutoRepeatingTimer )
- {
- mAutoRepeatingTimer.Reset();
- }
-}
+ { 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 }
+};
-void Button::SetDisabled( bool disabled )
+/**
+ * Checks if given map contains a text string
+ */
+bool MapContainsTextString( Property::Map& map )
{
- if( disabled != mDisabled )
+ bool result = false;
+ Property::Value* value = map.Find( Toolkit::TextVisual::Property::TEXT );
+ if ( value )
{
- unsigned int backgroundIndex;
- unsigned int buttonIndex;
-
- bool animationStarted = false;
-
- mDisabled = disabled;
-
- switch( mPaintState )
+ std::string textString;
+ value->Get( textString );
+ if ( !textString.empty() )
{
- case UnselectedState:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mDisabledContent );
-
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mDisabledBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = UnselectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledUnselectedState;
- }
- break;
- }
- case SelectedState:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mDisabledSelectedContent );
-
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mDisabledBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = SelectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledSelectedState;
- }
- break;
- }
- case DisabledUnselectedState:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mButtonContent );
-
- if( mDisabledBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = DisabledUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
- break;
- }
- case DisabledSelectedState:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mSelectedContent );
-
- if( mDisabledBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mSelectedBackgroundContent );
- InsertChild( backgroundIndex, mBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = DisabledSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
- }
- case UnselectedSelectedTransition:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mDisabledSelectedContent );
-
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mDisabledBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = SelectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledSelectedState;
- }
- break;
- }
- case SelectedUnselectedTransition:
- {
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mDisabledContent );
-
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mDisabledBackgroundContent );
-
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = UnselectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledUnselectedState;
- }
- break;
- }
- case UnselectedDisabledTransition:
- {
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = DisabledUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
- break;
- }
- case DisabledUnselectedTransition:
- {
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = UnselectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledUnselectedState;
- }
- break;
- }
- case SelectedDisabledTransition:
- {
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = DisabledSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
- }
- case DisabledSelectedTransition:
- {
- animationStarted = OnDisabled();
-
- if( animationStarted )
- {
- mPaintState = SelectedDisabledTransition;
- }
- else
- {
- mPaintState = DisabledSelectedState;
- }
- break;
- }
+ result = true;
}
}
+ return result;
}
-bool Button::IsDisabled() const
+} // unnamed namespace
+
+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 )
+{
+}
+
+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 );
- }
-}
-
-void Button::SetSelected( bool selected, bool emitSignal )
-{
- unsigned int buttonIndex, backgroundIndex;
- bool animationStarted = false;
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetSelected (%s)\n", (selected?"true":"false") );
- mSelected = selected;
-
- switch( mPaintState )
- {
- case UnselectedState:
+ if ( selected && ( mButtonState != SELECTED_STATE ) )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mSelectedContent );
-
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mSelectedBackgroundContent );
-
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
-
- if( animationStarted )
- {
- mPaintState = UnselectedSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
+ ChangeState( SELECTED_STATE );
}
- case SelectedState:
+ else if ( !selected && ( mButtonState != UNSELECTED_STATE ) )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mButtonContent );
-
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
-
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
- break;
+ ChangeState( UNSELECTED_STATE );
}
- case UnselectedSelectedTransition:
- {
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
+ }
+}
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
- break;
- }
- case SelectedUnselectedTransition:
- {
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
+void Button::SetDisabled( bool disabled )
+{
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SetDisabled(%s) state(%d)\n", (disabled)?"disabled":"active", mButtonState );
- if( animationStarted )
- {
- mPaintState = UnselectedSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
+ if ( disabled )
+ {
+ if ( mButtonState == SELECTED_STATE )
+ {
+ ChangeState( DISABLED_SELECTED_STATE );
}
- case DisabledUnselectedTransition:
+ else if ( mButtonState == UNSELECTED_STATE )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mSelectedContent );
-
- if( mDisabledBackgroundContent )
- {
- if( mBackgroundContent )
- {
- backgroundIndex = 2;
- }
- else
- {
- backgroundIndex = 1;
- }
- }
- else if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
-
- InsertChild( backgroundIndex, mSelectedBackgroundContent );
-
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
-
- if( animationStarted )
- {
- mPaintState = UnselectedSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
+ ChangeState( DISABLED_UNSELECTED_STATE );
}
- case DisabledSelectedTransition:
+ }
+ else
+ {
+ if ( mButtonState == DISABLED_SELECTED_STATE )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mButtonContent );
-
- // Notifies the derived class the button has been selected.
- animationStarted = OnSelected();
-
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
- break;
+ ChangeState( SELECTED_STATE );
}
- default:
+ else if ( mButtonState == DISABLED_UNSELECTED_STATE )
{
- break;
+ ChangeState( UNSELECTED_STATE );
}
}
-
- if( emitSignal )
- {
- Toolkit::Button handle( GetOwner() );
-
- // Emit signal.
- mStateChangedSignal.Emit( handle );
- }
-
- RelayoutRequest();
}
-bool Button::IsSelected() const
+bool Button::IsDisabled() const
{
- return mTogglableButton && mSelected;
+ return ( mButtonState == DISABLED_SELECTED_STATE || mButtonState == DISABLED_UNSELECTED_STATE ) ;
}
-void Button::SetAnimationTime( float animationTime )
+bool Button::ValidateState( State requestedState )
{
- mAnimationTime = animationTime;
-}
+ /* 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 }
+ };
-float Button::GetAnimationTime() const
-{
- return mAnimationTime;
-}
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ValidateState ReuestedState:%d, CurrentState:%d, result:%s\n",
+ requestedState, mButtonState, (transitionTable[mButtonState][requestedState])?"change-accepted":"change-denied");
-void Button::SetLabel( const std::string& label )
-{
- Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( label );
- SetLabel( textLabel );
+ return transitionTable[mButtonState][requestedState];
}
-void Button::SetLabel( Actor label )
+void Button::PerformFunctionOnVisualsInState( void(Button::*functionPtr)( Property::Index visualIndex), State state )
{
- if( mLabel != label )
- {
- if( mLabel && mLabel.GetParent() )
- {
- mLabel.GetParent().Remove( mLabel );
- }
-
- mLabel = label;
- mLabel.SetPosition( 0.f, 0.f );
+ 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 );
- // label should be the top of the button
- Self().Add( mLabel );
-
- OnLabelSet();
-
- RelayoutRequest();
- }
-}
-
-Actor Button::GetLabel() const
-{
- return mLabel;
-}
+ (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] );
+ (this->*functionPtr)( GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] );
-Actor& Button::GetLabel()
-{
- return mLabel;
+ RelayoutRequest();
}
-void Button::SetButtonImage( Actor image )
+void Button::ChangeState( State requestedState )
{
- StopAllAnimations();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d)\n", requestedState );
- if( mButtonContent && mButtonContent.GetParent() )
+ // Validate State before changing
+ if ( !ValidateState( requestedState ))
{
- Self().Remove( mButtonContent );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::ChangeState ReuestedState(%d) not validated\n", requestedState );
+ return;
}
- mButtonContent = image;
-
- mButtonContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mButtonContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mButtonContent.SetPosition( 0.f, 0.f );
+ // 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
- if( mPaintState == UnselectedState )
+ if ( Self().OnStage() )
{
- unsigned int index = FindChildIndex( mLabel );
-
- Self().Insert( index, mButtonContent );
+ 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
}
- OnButtonImageSet();
+ Toolkit::Button handle( GetOwner() );
+ // Emit signal.
+ mStateChangedSignal.Emit( handle );
}
-Actor Button::GetButtonImage() const
+bool Button::IsSelected() const
{
- return mButtonContent;
+ bool selected = ( mButtonState == SELECTED_STATE ) || ( mButtonState == DISABLED_SELECTED_STATE );
+ return mTogglableButton && selected;
}
-Actor& Button::GetButtonImage()
+void Button::SetLabelText( const std::string& label )
{
- return mButtonContent;
+ Self().SetProperty( Toolkit::Button::Property::LABEL, label );
}
-void Button::SetSelectedImage( Actor image )
+std::string Button::GetLabelText() const
{
- StopAllAnimations();
+ Property::Value value = Self().GetProperty( Toolkit::Button::Property::LABEL );
- if( mSelectedContent && mSelectedContent.GetParent() )
- {
- Self().Remove( mSelectedContent );
- }
-
- mSelectedContent = image;
+ Property::Map *labelProperty = value.GetMap();
- mSelectedContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mSelectedContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mSelectedContent.SetPosition( 0.f, 0.f );
+ std::string textLabel;
- if( mPaintState == SelectedState )
+ if ( labelProperty )
{
- unsigned int index = FindChildIndex( mLabel );
-
- Self().Insert( index, mSelectedContent );
+ Property::Value* value = labelProperty->Find( Toolkit::TextVisual::Property::TEXT );
+ if( value )
+ {
+ value->Get( textLabel );
+ }
}
- OnSelectedImageSet();
+ return textLabel;
}
-Actor Button::GetSelectedImage() const
-{
- return mSelectedContent;
-}
-
-Actor& Button::GetSelectedImage()
-{
- return mSelectedContent;
-}
-
-void Button::SetBackgroundImage( Actor image )
+void Button::MergeWithExistingLabelProperties( const Property::Map& inMap, Property::Map& outMap )
{
- StopAllAnimations();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties with %d properties\n", inMap.Count() );
- if( mBackgroundContent && mBackgroundContent.GetParent() )
+ /**
+ * 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 = DevelControl::GetVisual( *this, Toolkit::Button::Property::LABEL );
+ if ( visual )
{
- Self().Remove( mBackgroundContent );
+ 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() );
}
- mBackgroundContent = image;
+ outMap.Merge( inMap );
- mBackgroundContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mBackgroundContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mBackgroundContent.SetPosition( 0.f, 0.f );
+ // Store if a text string has been supplied.
- if( mPaintState == UnselectedState || mPaintState == SelectedState )
- {
- Self().Insert( 0, mBackgroundContent );
- }
+ mTextStringSetFlag = MapContainsTextString( outMap );
- OnBackgroundImageSet();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "MergeLabelProperties now has %d properties\n", outMap.Count() );
}
-Actor Button::GetBackgroundImage() const
+void Button::SetLabelAlignment( Button::Align labelAlignment)
{
- return mBackgroundContent;
+ mTextLabelAlignment = labelAlignment;
+ RelayoutRequest();
}
-Actor& Button::GetBackgroundImage()
+Button::Align Button::GetLabelAlignment()
{
- return mBackgroundContent;
+ return mTextLabelAlignment;
}
-void Button::SetSelectedBackgroundImage( Actor image )
-{
- StopAllAnimations();
-
- if( mSelectedBackgroundContent && mSelectedBackgroundContent.GetParent() )
- {
- Self().Remove( mSelectedBackgroundContent );
- }
-
- mSelectedBackgroundContent = image;
+/**
+ * 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
+ */
- mSelectedBackgroundContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mSelectedBackgroundContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mSelectedBackgroundContent.SetPosition( 0.f, 0.f );
+void Button::CreateVisualsForComponent( Property::Index index, const Property::Value& value, const int visualDepth )
+{
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent index(%d)\n", index );
+ Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
+ Toolkit::Visual::Base buttonVisual;
- if( mPaintState == SelectedState )
+ std::string imageUrl;
+ if( value.Get( imageUrl ) )
{
- if( mBackgroundContent )
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent Using image URL(%d)\n", index );
+ if ( !imageUrl.empty() )
{
- Self().Insert( 1, mSelectedBackgroundContent );
+ DALI_ASSERT_DEBUG( index != Toolkit::Button::Property::LABEL && "Creating a Image Visual instead of Text Visual " );
+ buttonVisual = visualFactory.CreateVisual( imageUrl, ImageDimensions() );
}
- else
+ }
+ else
+ {
+ // 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.
{
- Self().Insert( 0, mSelectedBackgroundContent );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent Using Map(%d)\n", index );
+ buttonVisual = visualFactory.CreateVisual( *map );
}
}
- OnSelectedBackgroundImageSet();
-}
-
-Actor Button::GetSelectedBackgroundImage() const
-{
- return mSelectedBackgroundContent;
-}
-
-Actor& Button::GetSelectedBackgroundImage()
-{
- return mSelectedBackgroundContent;
-}
-
-void Button::SetDisabledImage( Actor image )
-{
- StopAllAnimations();
-
- if( mDisabledContent && mDisabledContent.GetParent() )
+ if ( buttonVisual )
{
- Self().Remove( mDisabledContent );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "CreateVisualsForComponent RegisterVisual index(%d) enabled(%s)\n",
+ index, DevelControl::IsVisualEnabled( *this, index )?"true":"false" );
+ DevelControl::RegisterVisual( *this, index, buttonVisual, DevelControl::IsVisualEnabled( *this, index ), visualDepth );
}
-
- mDisabledContent = image;
-
- mDisabledContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mDisabledContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mDisabledContent.SetPosition( 0.f, 0.f );
-
- if( mPaintState == DisabledUnselectedState || mPaintState == DisabledSelectedState )
+ else
{
- unsigned int index = FindChildIndex( mLabel );
-
- Self().Insert( index, mDisabledContent );
+ DevelControl::UnregisterVisual( *this, index );
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "CreateVisualsForComponent Visual not created or empty map (clearing visual).(%d)\n", index);
}
-
- OnDisabledImageSet();
+ PerformFunctionOnVisualsInState( &Button::SelectRequiredVisual, mButtonState );
}
-Actor Button::GetDisabledImage() const
+bool Button::GetPropertyMapForVisual( Property::Index visualIndex, Property::Map& retreivedMap ) const
{
- return mDisabledContent;
-}
-
-Actor& Button::GetDisabledImage()
-{
- return mDisabledContent;
-}
-
-void Button::SetDisabledSelectedImage( Actor image )
-{
- StopAllAnimations();
-
- if( mDisabledSelectedContent && mDisabledSelectedContent.GetParent() )
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetPropertyMapForVisual visual(%d)\n", visualIndex);
+ bool success = false;
+ Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, visualIndex );
+ if ( visual )
{
- Self().Remove( mDisabledSelectedContent );
+ visual.CreatePropertyMap( retreivedMap );
+ success = true;
}
-
- mDisabledSelectedContent = image;
-
- mDisabledSelectedContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mDisabledSelectedContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mDisabledSelectedContent.SetPosition( 0.f, 0.f );
-
- if( mPaintState == DisabledSelectedState )
- {
- unsigned int index = FindChildIndex( mLabel );
-
- Self().Insert( index, mDisabledSelectedContent );
- }
-
- OnDisabledSelectedImageSet();
-}
-
-Actor Button::GetDisabledSelectedImage() const
-{
- return mDisabledSelectedContent;
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetPropertyMapForVisual %s\n", success?"Success":"Failure");
+ return success;
}
-Actor& Button::GetDisabledSelectedImage()
-{
- return mDisabledSelectedContent;
-}
-
-void Button::SetDisabledBackgroundImage( Actor image )
-{
- StopAllAnimations();
-
- if( mDisabledBackgroundContent && mDisabledBackgroundContent.GetParent() )
- {
- Self().Remove( mDisabledBackgroundContent );
- }
-
- mDisabledBackgroundContent = image;
-
- mDisabledBackgroundContent.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mDisabledBackgroundContent.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mDisabledBackgroundContent.SetPosition( 0.f, 0.f );
-
- if( mPaintState == DisabledUnselectedState || mPaintState == DisabledSelectedState )
- {
- Self().Insert( 0, mDisabledBackgroundContent );
- }
-
- OnDisabledBackgroundImageSet();
-}
-
-Actor Button::GetDisabledBackgroundImage() const
-{
- return mDisabledBackgroundContent;
-}
-
-Actor& Button::GetDisabledBackgroundImage()
-{
- return mDisabledBackgroundContent;
-}
-
-bool Button::DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes )
+bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes )
{
bool ret = false;
Dali::BaseHandle handle( object );
Toolkit::Button button = Toolkit::Button::DownCast( handle );
-
- DALI_ASSERT_ALWAYS( button );
-
- if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) )
- {
- GetImplementation( button ).DoClickAction( attributes );
- ret = true;
- }
-
- return ret;
-}
-
-void Button::DoClickAction( const PropertyValueContainer& attributes )
-{
- // Prevents the button signals from doing a recursive loop by sending an action
- // and re-emitting the signals.
- if( !mClickActionPerforming )
- {
- mClickActionPerforming = true;
- OnButtonDown();
- mState = ButtonDown;
- OnButtonUp();
- mClickActionPerforming = false;
- }
-}
-
-void Button::UpdatePaintTransitionState()
-{
- switch( mPaintState )
- {
- case UnselectedSelectedTransition:
- {
- RemoveChild( mButtonContent );
- mPaintState = SelectedState;
- break;
- }
- case SelectedUnselectedTransition:
- {
- RemoveChild( mSelectedBackgroundContent );
- RemoveChild( mSelectedContent );
- mPaintState = UnselectedState;
- break;
- }
- case UnselectedDisabledTransition:
- {
- RemoveChild( mBackgroundContent );
- RemoveChild( mButtonContent );
- mPaintState = DisabledUnselectedState;
- break;
- }
- case DisabledUnselectedTransition:
- {
- RemoveChild( mDisabledBackgroundContent );
- RemoveChild( mDisabledContent );
- mPaintState = UnselectedState;
- break;
- }
- case SelectedDisabledTransition:
- {
- RemoveChild( mBackgroundContent );
- RemoveChild( mSelectedBackgroundContent );
- RemoveChild( mSelectedContent );
- mPaintState = DisabledSelectedState;
- break;
- }
- case DisabledSelectedTransition:
- {
- RemoveChild( mDisabledBackgroundContent );
- RemoveChild( mDisabledSelectedContent );
- mPaintState = SelectedState;
- break;
- }
- default:
- {
- break;
- }
+
+ DALI_ASSERT_DEBUG( button );
+
+ if( 0 == strcmp( actionName.c_str(), ACTION_BUTTON_CLICK ) )
+ {
+ ret = GetImplementation( button ).DoClickAction( attributes );
}
+
+ return ret;
}
-void Button::OnButtonStageDisconnection()
+bool Button::DoClickAction( const Property::Map& attributes )
{
- if( ButtonDown == mState )
+ // Prevents the button signals from doing a recursive loop by sending an action
+ // and re-emitting the signals.
+ if( !mClickActionPerforming )
{
- if( !mTogglableButton )
+ mClickActionPerforming = true;
+ ButtonDown();
+ if ( !mTogglableButton )
{
- Released();
-
- if( mAutoRepeating )
- {
- mAutoRepeatingTimer.Reset();
- }
+ 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
{
- Toolkit::Button handle( GetOwner() );
-
Pressed();
-
+ mButtonPressedState = DEPRESSED;
if( mAutoRepeating )
{
- SetUpTimer( mInitialAutoRepeatingDelay );
+ SetUpTimer( mInitialAutoRepeatingDelay );
}
-
- //Emit signal.
- mPressedSignal.Emit( handle );
}
+
+ // The pressed signal should be emitted regardless of toggle mode.
+ Toolkit::Button handle( GetOwner() );
+ mPressedSignal.Emit( handle );
}
-void Button::OnButtonUp()
+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();
}
-
- Toolkit::Button handle( GetOwner() );
-
- //Emit signal.
- mReleasedSignal.Emit( handle );
- mClickedSignal.Emit( handle );
+ 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 );
+ mClickedSignal.Emit( handle );
+ }
+}
+
+bool Button::OnToggleReleased()
+{
+ SetSelected( !IsSelected() );
+ mButtonPressedState = UNPRESSED;
+ return true;
}
+
void Button::OnTouchPointLeave()
{
- if( ButtonDown == mState )
+ if( DEPRESSED == mButtonPressedState )
{
if( !mTogglableButton )
{
- Toolkit::Button handle( GetOwner() );
-
Released();
if( mAutoRepeating )
{
mAutoRepeatingTimer.Reset();
}
-
- //Emit signal.
- mReleasedSignal.Emit( handle );
}
+
+ mButtonPressedState = UNPRESSED;
+
+ // The released signal should be emitted regardless of toggle mode.
+ Toolkit::Button handle( GetOwner() );
+ mReleasedSignal.Emit( handle );
}
}
return connected;
}
-bool Button::OnTouchEvent(const TouchEvent& event)
-{
- // Only events are processed when the button is not disabled and the touch event has only
- // one touch point.
- if( ( !mDisabled ) && ( 1 == event.GetPointCount() ) )
- {
- switch( event.GetPoint(0).state )
- {
- case TouchPoint::Down:
- {
- OnButtonDown(); // Notification for derived classes.
-
- // Sets the button state to ButtonDown.
- mState = ButtonDown;
- break;
- }
- case TouchPoint::Up:
- {
- OnButtonUp(); // Notification for derived classes.
-
- // Sets the button state to ButtonUp.
- mState = ButtonUp;
- break;
- }
- case TouchPoint::Interrupted:
- {
- OnTouchPointInterrupted(); // Notification for derived classes.
-
- // Sets the button state to the default (ButtonUp).
- mState = ButtonUp;
- break;
- }
- case TouchPoint::Leave:
- {
- OnTouchPointLeave(); // Notification for derived classes.
-
- // Sets the button state to the default (ButtonUp).
- mState = ButtonUp;
- break;
- }
- case TouchPoint::Motion:
- case TouchPoint::Stationary: // FALLTHROUGH
- {
- // Nothing to do
- break;
- }
- default:
- {
- DALI_ASSERT_ALWAYS( !"Point status unhandled." );
- break;
- }
- }
- }
- else if( 1 < event.GetPointCount() )
- {
- OnTouchPointLeave(); // Notification for derived classes.
-
- // Sets the button state to the default (ButtonUp).
- mState = ButtonUp;
- }
-
- return false;
-}
-
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);
- OnButtonInitialize();
-
- self.SetDrawMode( DrawMode::OVERLAY );
self.SetKeyboardFocusable( true );
-}
-void Button::OnActivated()
-{
- // When the button is activated, it performs the click action
- PropertyValueContainer attributes;
- DoClickAction( attributes );
+ self.TouchSignal().Connect( this, &Button::OnTouch );
}
-void Button::OnControlStageDisconnection()
+bool Button::OnAccessibilityActivated()
{
- OnButtonStageDisconnection(); // Notification for derived classes.
- mState = ButtonUp;
+ return OnKeyboardEnter();
}
-void Button::OnTap(Actor actor, const TapGesture& tap)
+bool Button::OnTouch( Actor actor, const TouchData& touch )
{
- // Do nothing.
+
+ // Only events are processed when the button is not disabled
+ auto result( false );
+
+ if( !IsDisabled() )
+ {
+ if ( 1 == touch.GetPointCount() )
+ {
+ switch( touch.GetState( 0 ) )
+ {
+ case PointState::DOWN:
+ {
+ ButtonDown();
+ break;
+ }
+ case PointState::UP:
+ {
+ ButtonUp();
+ break;
+ }
+ case PointState::INTERRUPTED:
+ {
+ OnTouchPointInterrupted();
+ break;
+ }
+ case PointState::LEAVE:
+ {
+ OnTouchPointLeave();
+ break;
+ }
+ case PointState::MOTION:
+ case PointState::STATIONARY: // FALLTHROUGH
+ {
+ // Nothing to do
+ break;
+ }
+ }
+ }
+ else if( 1 < touch.GetPointCount() )
+ {
+ OnTouchPointLeave(); // Notification for derived classes.
+
+ // Sets the button state to the default
+ mButtonPressedState = UNPRESSED;
+ }
+ result = true;
+ }
+ return result;
}
-void Button::SetUpTimer( float delay )
+bool Button::OnKeyboardEnter()
{
- mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
- mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot );
- mAutoRepeatingTimer.Start();
+ // When the enter key is pressed, or button is activated, the click action is performed.
+ Property::Map attributes;
+ bool ret = DoClickAction( attributes );
+
+ return ret;
}
-bool Button::AutoRepeatingSlot()
+void Button::OnStageDisconnection()
{
- bool consumed = false;
- if( !mDisabled )
+ if( DEPRESSED == mButtonPressedState )
{
- // Restart the autorepeat timer.
- SetUpTimer( mNextAutoRepeatingDelay );
+ if( !mTogglableButton )
+ {
+ Released();
- Pressed();
+ if( mAutoRepeating )
+ {
+ mAutoRepeatingTimer.Reset();
+ }
+ }
+ }
- Toolkit::Button handle( GetOwner() );
+ mButtonPressedState = UNPRESSED;
- //Emit signal.
- consumed = mReleasedSignal.Emit( handle );
- consumed |= mClickedSignal.Emit( handle );
- consumed |= mPressedSignal.Emit( handle );
- }
+ Control::OnStageDisconnection(); // Visuals will be set off stage
+}
- return consumed;
+void Button::OnStageConnection( int depth )
+{
+ 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
}
-void Button::Pressed()
+Vector3 Button::GetNaturalSize()
{
- unsigned int buttonIndex, backgroundIndex;
- bool animationStarted = false;
+ Vector3 size = Vector3::ZERO;
- switch( mPaintState )
+ 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++ )
{
- case UnselectedState:
+ Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, GET_VISUAL_INDEX_FOR_STATE[state][FOREGROUND] );
+ Size visualSize;
+ if ( visual )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mSelectedContent );
+ visual.GetNaturalSize( visualSize );
+ largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width );
+ largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height );
+ foreGroundVisualUsed = true;
+ }
+ }
- if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
+ 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 = DevelControl::GetVisual( *this, GET_VISUAL_INDEX_FOR_STATE[state][BACKGROUND] );
+ Size visualSize;
+ if ( visual )
{
- backgroundIndex = 0;
+ visual.GetNaturalSize( visualSize );
+ largestProvidedVisual.width = std::max(largestProvidedVisual.width, visualSize.width );
+ largestProvidedVisual.height = std::max(largestProvidedVisual.height, visualSize.height );
}
+ }
+ }
- InsertChild( backgroundIndex, mSelectedBackgroundContent );
+ // 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;
+ }
- // Notifies the derived class the button has been pressed.
- animationStarted = OnPressed();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "GetNaturalSize visual Size(%f,%f)\n",
+ largestProvidedVisual.width, largestProvidedVisual.height );
- if( animationStarted )
- {
- mPaintState = UnselectedSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
- }
- case SelectedUnselectedTransition:
- {
- // Notifies the derived class the button has been pressed.
- animationStarted = OnPressed();
+ // Get natural size of label if text has been set
+ if ( mTextStringSetFlag )
+ {
+ Toolkit::Visual::Base visual = DevelControl::GetVisual( *this, Toolkit::Button::Property::LABEL );
- if( animationStarted )
- {
- mPaintState = UnselectedSelectedTransition;
- }
- else
- {
- mPaintState = SelectedState;
- }
- break;
- }
- case DisabledUnselectedTransition:
+ if ( visual )
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mSelectedContent );
+ visual.GetNaturalSize( labelSize );
- if( mDisabledBackgroundContent )
- {
- if( mBackgroundContent )
- {
- backgroundIndex = 2;
- }
- else
- {
- backgroundIndex = 1;
- }
- }
- else if( mBackgroundContent )
- {
- backgroundIndex = 1;
- }
- else
- {
- backgroundIndex = 0;
- }
+ 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);
- InsertChild( backgroundIndex, mSelectedBackgroundContent );
+ labelSize.width += mLabelPadding.left + mLabelPadding.right;
+ labelSize.height += mLabelPadding.top + mLabelPadding.bottom;
- // Notifies the derived class the button has been pressed.
- animationStarted = OnPressed();
-
- if( animationStarted )
+ // Add label size to height or width depending on alignment position
+ if ( horizontalAlignment )
{
- mPaintState = UnselectedSelectedTransition;
+ size.width += labelSize.width;
+ size.height = std::max(size.height, labelSize.height );
}
else
{
- mPaintState = SelectedState;
+ size.height += labelSize.height;
+ size.width = std::max(size.width, labelSize.width );
}
- break;
}
- default:
- break;
}
+
+ 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::Released()
+void Button::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+{
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnSetResizePolicy\n");
+ RelayoutRequest();
+}
+
+/**
+ * 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 )
{
- unsigned int buttonIndex;
- bool animationStarted = false;
+ 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 = DevelControl::GetVisual( *this, GET_VISUAL_INDEX_FOR_STATE[mButtonState][FOREGROUND] );
+
+ Toolkit::Visual::Base currentBackGroundVisual = DevelControl::GetVisual( *this, GET_VISUAL_INDEX_FOR_STATE[mButtonState][BACKGROUND] );
+
+ // 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 )
+ {
+ 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;
+ }
+
+ 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;
+ }
+
+ Toolkit::Align::Type visualAnchorPoint = Toolkit::Align::TOP_BEGIN;
+
+ 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);
- switch( mPaintState )
+ // 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 )
{
- case SelectedState:
+ case BEGIN :
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mButtonContent );
+ visualAnchorPoint = Toolkit::Align::TOP_END;
+ visualPosition.x = foregroundVisualPadding.right;
+ visualPosition.y = foregroundVisualPadding.top;
- // Notifies the derived class the button has been released.
- animationStarted = OnReleased();
+ labelPosition.x = labelVisualPadding.x;
+ labelPosition.y = labelVisualPadding.top;
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
+ remainingSpaceForText.width = size.width - visualAndPaddingSize.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - labelVisualPadding.top - labelVisualPadding.bottom;
break;
}
- case UnselectedSelectedTransition:
+ case END :
{
- // Notifies the derived class the button has been released.
- animationStarted = OnReleased();
+ visualAnchorPoint = Toolkit::Align::TOP_BEGIN;
+ visualPosition.x = foregroundVisualPadding.left;
+ visualPosition.y = foregroundVisualPadding.top;
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
- {
- mPaintState = UnselectedState;
- }
+ labelPosition.x = visualAndPaddingSize.width + labelVisualPadding.x;
+ labelPosition.y = labelVisualPadding.top;
+
+ remainingSpaceForText.width = size.width - visualAndPaddingSize.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - labelVisualPadding.top - labelVisualPadding.bottom;
break;
}
- case DisabledSelectedTransition:
+ case TOP :
{
- buttonIndex = FindChildIndex( mLabel );
- InsertChild( buttonIndex, mButtonContent );
+ visualAnchorPoint = Toolkit::Align::BOTTOM_END;
+ visualPosition.x = foregroundVisualPadding.left;
+ visualPosition.y = foregroundVisualPadding.bottom;
- // Notifies the derived class the button has been released.
- animationStarted = OnReleased();
+ labelPosition.x = labelVisualPadding.left;
+ labelPosition.y = labelVisualPadding.top;
- if( animationStarted )
- {
- mPaintState = SelectedUnselectedTransition;
- }
- else
+ remainingSpaceForText.width = size.width - labelVisualPadding.x - labelVisualPadding.y;
+ remainingSpaceForText.height = size.height - visualAndPaddingSize.height - labelVisualPadding.top - labelVisualPadding.bottom;
+
+ break;
+ }
+ case BOTTOM :
+ {
+ 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;
+ }
+ }
+
+ if ( currentBackGroundVisual )
+ {
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual background size to(%f,%f)\n", size.width, size.height);
+
+ Property::Map visualTransform;
+
+ visualTransform.Add( Toolkit::Visual::Transform::Property::SIZE, size )
+ .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
+
+ 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::Visual::Transform::Property::SIZE, visualSize )
+ .Add( Toolkit::Visual::Transform::Property::OFFSET, visualPosition )
+ .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
+ .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
+ .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
+ .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, visualAnchorPoint );
+
+ currentVisual.SetTransformAndSize( visualTransform, size );
+ }
+
+ if ( mTextStringSetFlag )
+ {
+ Toolkit::Visual::Base textVisual = DevelControl::GetVisual( *this, Toolkit::Button::Property::LABEL ); // No need to search for Label visual if no text set.
+
+ if ( textVisual )
+ {
+ if ( !currentVisual )
{
- mPaintState = UnselectedState;
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Only Text\n");
+ labelPosition.x = labelVisualPadding.left;
+ labelPosition.y = labelVisualPadding.height;
}
- break;
- }
- default:
- {
- break;
+
+ Vector2 preSize = Vector2( static_cast< int >( remainingSpaceForText.x ), static_cast< int >( remainingSpaceForText.y ));
+
+ 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::Visual::Transform::Property::SIZE, preSize )
+ .Add( Toolkit::Visual::Transform::Property::OFFSET, labelPosition )
+ .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
+ .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
+ .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
+ .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, visualAnchorPoint );
+
+ textVisual.SetTransformAndSize( textVisualTransform, size );
}
}
+
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout selected (%s) \n", IsSelected()?"yes":"no" );
+
+ DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout << \n");
+}
+
+void Button::OnTap(Actor actor, const TapGesture& tap)
+{
+ // Prevents Parent getting a tap event
}
-Button::ButtonState Button::GetState()
+void Button::SetUpTimer( float delay )
{
- return mState;
+ mAutoRepeatingTimer = Dali::Timer::New( static_cast<unsigned int>( 1000.f * delay ) );
+ mAutoRepeatingTimer.TickSignal().Connect( this, &Button::AutoRepeatingSlot );
+ mAutoRepeatingTimer.Start();
}
-Button::PaintState Button::GetPaintState()
+bool Button::AutoRepeatingSlot()
{
- return mPaintState;
+ bool consumed = false;
+ if( !IsDisabled() )
+ {
+ // 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::InsertChild( unsigned int index, Actor& actor )
+void Button::Pressed()
{
- if( actor )
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::Pressed\n" );
+
+ if( mButtonState == UNSELECTED_STATE )
{
- Self().Insert( index, actor);
+ ChangeState( SELECTED_STATE );
+ OnPressed(); // Notifies the derived class the button has been pressed.
}
}
-void Button::RemoveChild( Actor& actor )
+void Button::Released()
{
- if( actor && actor.GetParent() )
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::Released\n" );
+
+ if( mButtonState == SELECTED_STATE && !mTogglableButton )
{
- Self().Remove( actor );
+ ChangeState( UNSELECTED_STATE );
+ OnReleased(); // // Notifies the derived class the button has been released.
}
+ mButtonPressedState = UNPRESSED;
}
-unsigned int Button::FindChildIndex( Actor& actor )
+void Button::SelectRequiredVisual( Property::Index visualIndex )
{
- Actor self = Self();
- unsigned int childrenNum = self.GetChildCount();
+ DALI_LOG_INFO( gLogButtonFilter, Debug::Verbose, "Button::SelectRequiredVisual index(%d) state(%d)\n", visualIndex, mButtonState );
+
+ DevelControl::EnableVisual( *this, visualIndex, true );
+}
- for( unsigned int i = 0; i < childrenNum; i++ )
+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 = DevelControl::GetVisual( *this, visualIndex );
+
+ if( visual )
{
- Actor child = self.GetChildAt( i );
- if( child == actor )
- {
- return i;
- }
+ DevelControl::EnableVisual( *this, visualIndex, false );
}
+}
- return childrenNum;
+void Button::OnButtonVisualRemoval( Property::Index visualIndex )
+{
+ // 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 )
{
case Toolkit::Button::Property::DISABLED:
{
- GetImplementation( button ).SetDisabled( value.Get<bool>() );
+ GetImplementation( button ).SetDisabled( value.Get< bool >() );
break;
}
break;
}
- case Toolkit::Button::Property::NORMAL_STATE_ACTOR:
+ case Toolkit::Button::Property::UNSELECTED_STATE_IMAGE: // Legacy Tizen 3.0
+ {
+ GetImplementation( button ).CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, value, DepthIndex::BACKGROUND );
+ break;
+ }
+ 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 ).CreateVisualsForComponent( index, value, DepthIndex::CONTENT );
+ break;
+ }
+
+ 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 ).CreateVisualsForComponent( index , value, DepthIndex::BACKGROUND);
+ break;
+ }
+
+ case Toolkit::Button::Property::UNSELECTED_COLOR:
+ {
+ 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:
+ {
+ 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:
+ {
+ 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:
{
- GetImplementation( button ).SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ 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::Visual::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::Button::Property::SELECTED_STATE_ACTOR:
+ case Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT:
{
- GetImplementation( button ).SetSelectedImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ 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::Button::Property::DISABLED_STATE_ACTOR:
+ case Toolkit::DevelButton::Property::LABEL_PADDING:
{
- GetImplementation( button ).SetDisabledImage( Scripting::NewActor( value.Get< Property::Map >() ) );
+ Vector4 padding ( value.Get< Vector4 >() );
+ GetImplementation( button ).SetLabelPadding( Padding( padding.x, padding.y, padding.z, padding.w ) );
break;
}
- case Toolkit::Button::Property::LABEL_ACTOR:
+ case Toolkit::DevelButton::Property::VISUAL_PADDING:
{
- GetImplementation( button ).SetLabel( Scripting::NewActor( value.Get< Property::Map >() ) );
+ Vector4 padding ( value.Get< Vector4 >() );
+ GetImplementation( button ).SetForegroundPadding( Padding( padding.x, padding.y, padding.z, padding.w ) );
+ GetImplementation( button ).RelayoutRequest();
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 ).GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
+ break;
+ }
+
+ case Toolkit::Button::Property::SELECTED_STATE_IMAGE:
+ {
+ value = GetImplementation( button ).GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL );
+ break;
+ }
+
+ case Toolkit::Button::Property::DISABLED_STATE_IMAGE:
+ {
+ 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;
+ }
+
+ case Toolkit::Button::Property::UNSELECTED_COLOR:
+ {
+ value = GetImplementation( button ).GetUnselectedColor();
break;
}
- case Toolkit::Button::Property::NORMAL_STATE_ACTOR:
+ case Toolkit::Button::Property::SELECTED_COLOR:
{
- Property::Map map;
- Scripting::CreatePropertyMap( GetImplementation( button ).mButtonContent, map );
- value = map;
+ value = GetImplementation( button ).GetSelectedColor();
break;
}
- case Toolkit::Button::Property::SELECTED_STATE_ACTOR:
+ case Toolkit::Button::Property::LABEL_TEXT:
{
- Property::Map map;
- Scripting::CreatePropertyMap( GetImplementation( button ).mSelectedContent, map );
- value = map;
+ value = GetImplementation( button ).GetLabelText();
break;
}
- case Toolkit::Button::Property::DISABLED_STATE_ACTOR:
+ case Toolkit::DevelButton::Property::LABEL_RELATIVE_ALIGNMENT:
{
- Property::Map map;
- Scripting::CreatePropertyMap( GetImplementation( button ).mDisabledContent, map );
- value = map;
+ 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::Button::Property::LABEL_ACTOR:
+ case Toolkit::DevelButton::Property::LABEL_PADDING:
{
- Property::Map map;
- Scripting::CreatePropertyMap( GetImplementation( button ).mLabel, map );
- value = map;
+ 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;
}
+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();
+}
+
+Padding Button::GetLabelPadding()
+{
+ return mLabelPadding;
+}
+
+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();
+}
+
+Padding Button::GetForegroundPadding()
+{
+ return mForegroundPadding;
+}
+
+////////////////////////////////////////////////////////////////////////
+// Legacy functions from Tizen 2.4 and 3.0
+
+// 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 );
+}
+
+const Vector4 Button::GetUnselectedColor() const
+{
+ return mUnselectedColor;
+}
+
+const Vector4 Button::GetSelectedColor() const
+{
+ return mSelectedColor;
+}
+
+void Button::SetAnimationTime( float animationTime )
+{
+ // Used by deprecated API
+ mAnimationTime = animationTime;
+}
+
+float Button::GetAnimationTime() const
+{
+ // Used by deprecated API
+ return mAnimationTime;
+}
+
+void Button::SetLabel( Actor label )
+{
+ if ( label )
+ {
+ Property::Value value ="";
+ value = label.GetProperty(Toolkit::TextLabel::Property::TEXT);
+
+ SetLabelText( value.Get<std::string>() );
+ }
+}
+
+void Button::SetUnselectedImage( const std::string& filename )
+{
+ SetBackgroundImage( filename );
+}
+
+void Button::SetBackgroundImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+ else
+ {
+ DevelControl::UnregisterVisual( *this, Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
+ }
+}
+
+void Button::SetSelectedImage( const std::string& filename )
+{
+ SetSelectedBackgroundImage( filename );
+}
+
+void Button::SetSelectedBackgroundImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+ else
+ {
+ DevelControl::UnregisterVisual( *this, Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL );
+ }
+}
+
+void Button::SetDisabledBackgroundImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, filename, DepthIndex::BACKGROUND );
+ }
+}
+
+void Button::SetDisabledImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_UNSELECTED_VISUAL, filename, DepthIndex::CONTENT );
+ }
+}
+
+void Button::SetDisabledSelectedImage( const std::string& filename )
+{
+ if( !filename.empty() )
+ {
+ CreateVisualsForComponent( Toolkit::DevelButton::Property::DISABLED_SELECTED_VISUAL, filename, DepthIndex::CONTENT );
+ }
+}
+
+// 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 = DevelControl::GetVisual( *this, index );
+ std::string result;
+
+ 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;
+}
+
+// Below functions DEPRECATED_1_0.50 - Return empty Actors
+
+namespace
+{
+std::string GetUrlFromImage( Image& image )
+{
+ ResourceImage resourceImage = ResourceImage::DownCast( image );
+
+ std::string imageUrl;
+
+ 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 ) );
+ mSetButtonImage = image;
+}
+
+void Button::SetSelectedImage( Image image )
+{
+ DALI_LOG_WARNING("Button::SetSelectedImage @DEPRECATED_1_0.50\n");
+ SetSelectedImage( GetUrlFromImage( image ) );
+ mSetSelectedImage = image;
+}
+
+Actor Button::GetButtonImage() const
+{
+ // When deprecated ImageView API removed then this button API can be removed too.
+ DALI_LOG_WARNING("Button::GetButtonImage @DEPRECATED_1_0.50\n");
+
+ Actor imageView;
+
+ if ( mSetButtonImage )
+ {
+ imageView = Toolkit::ImageView::New( mSetButtonImage );
+ }
+ else
+ {
+ ResourceImage image = ResourceImage::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL ) );
+ imageView = Toolkit::ImageView::New( image );
+ }
+
+ return imageView;
+}
+
+Actor Button::GetSelectedImage() const
+{
+ // When deprecated ImageView API removed then this button API can be removed too.
+ DALI_LOG_WARNING("Button::GetSelectedImage @DEPRECATED_1_0.50\n");
+
+ Actor imageView;
+
+ if ( mSetSelectedImage )
+ {
+ imageView = Toolkit::ImageView::New( mSetSelectedImage );
+ }
+ else
+ {
+ ResourceImage image = ResourceImage::New( GetUrlForImageVisual( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL ) );
+ imageView = Toolkit::ImageView::New( image );
+ }
+ return imageView;
+}
+
} // namespace Internal
} // namespace Toolkit