X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=bb2732c16af08c9919cd3c819eb5704db57019ec;hp=f68676684a2b45357956a9862feff40cc9dc6941;hb=a78bb823aebc305823855ac35b3413aaff7bc684;hpb=ee3bdc95f623f41feb37be10f21bef1d9da1e805 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index f686766..bb2732c 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -19,21 +19,25 @@ #include // EXTERNAL INCLUDES +#include // for strcmp +#include #include #include -#include +#include +#include #include -#include +#include #include -#include +#include +#include +#include #include -#include -#include +// INTERNAL INCLUDES #include #include #include -#include +#include #include namespace Dali @@ -42,146 +46,142 @@ namespace Dali namespace Toolkit { -const Property::Index Control::PROPERTY_BACKGROUND_COLOR = Internal::Control::CONTROL_PROPERTY_START_INDEX; -const Property::Index Control::PROPERTY_BACKGROUND = Internal::Control::CONTROL_PROPERTY_START_INDEX + 1; -const Property::Index Control::PROPERTY_WIDTH_POLICY = Internal::Control::CONTROL_PROPERTY_START_INDEX + 2; -const Property::Index Control::PROPERTY_HEIGHT_POLICY = Internal::Control::CONTROL_PROPERTY_START_INDEX + 3; -const Property::Index Control::PROPERTY_MINIMUM_SIZE = Internal::Control::CONTROL_PROPERTY_START_INDEX + 4; -const Property::Index Control::PROPERTY_MAXIMUM_SIZE = Internal::Control::CONTROL_PROPERTY_START_INDEX + 5; -const Property::Index Control::PROPERTY_KEY_INPUT_FOCUS = Internal::Control::CONTROL_PROPERTY_START_INDEX + 6; - namespace { -// Signals - -const char* const SIGNAL_KEY_EVENT = "key-event"; -const char* const SIGNAL_TAPPED = "tapped"; -const char* const SIGNAL_PANNED = "panned"; -const char* const SIGNAL_PINCHED = "pinched"; -const char* const SIGNAL_LONG_PRESSED = "long-pressed"; - -// Actions - -const char* const ACTION_CONTROL_ACTIVATED = "control-activated"; - -const Scripting::StringEnum< Control::SizePolicy > SIZE_POLICY_STRING_TABLE[] = -{ - { "FIXED", Control::Fixed }, - { "MINIMUM", Control::Minimum }, - { "MAXIMUM", Control::Maximum }, - { "RANGE", Control::Range }, - { "FLEXIBLE", Control::Flexible }, -}; -const unsigned int SIZE_POLICY_STRING_TABLE_COUNT = sizeof( SIZE_POLICY_STRING_TABLE ) / sizeof( SIZE_POLICY_STRING_TABLE[0] ); - -#if defined(DEBUG_ENABLED) -Integration::Log::Filter* gLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_CONTROL"); -#endif - -const float MAX_FLOAT_VALUE( std::numeric_limits::max() ); -const Vector3 MAX_SIZE( MAX_FLOAT_VALUE, MAX_FLOAT_VALUE, MAX_FLOAT_VALUE ); const float BACKGROUND_ACTOR_Z_POSITION( -0.1f ); +/** + * Creates control through type registry + */ BaseHandle Create() { return Internal::Control::New(); } -TypeRegistration CONTROL_TYPE( typeid(Control), typeid(CustomActor), Create ); - -// Property Registration after Internal::Control::Impl definition below - -TypeAction ACTION_TYPE_1( CONTROL_TYPE, ACTION_CONTROL_ACTIVATED, &Internal::Control::DoAction ); - -SignalConnectorType SIGNAL_CONNECTOR_1( CONTROL_TYPE, SIGNAL_KEY_EVENT, &Internal::Control::DoConnectSignal ); -SignalConnectorType SIGNAL_CONNECTOR_2( CONTROL_TYPE, SIGNAL_TAPPED, &Internal::Control::DoConnectSignal ); -SignalConnectorType SIGNAL_CONNECTOR_3( CONTROL_TYPE, SIGNAL_PANNED, &Internal::Control::DoConnectSignal ); -SignalConnectorType SIGNAL_CONNECTOR_4( CONTROL_TYPE, SIGNAL_PINCHED, &Internal::Control::DoConnectSignal ); -SignalConnectorType SIGNAL_CONNECTOR_5( CONTROL_TYPE, SIGNAL_LONG_PRESSED, &Internal::Control::DoConnectSignal ); - /** - * Structure which holds information about the background of a control + * Performs actions as requested using the action name. + * @param[in] object The object on which to perform the action. + * @param[in] actionName The action to perform. + * @param[in] attributes The attributes with which to perfrom this action. + * @return true if action has been accepted by this control */ -struct Background +const char* ACTION_CONTROL_ACTIVATED = "control-activated"; +static bool DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes ) { - Actor actor; ///< Either a MeshActor or an ImageActor - Vector4 color; ///< The color of the actor. + bool ret = false; - /** - * Constructor - */ - Background() - : actor(), - color( Color::WHITE ) + if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) ) { + Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); + if( control ) + { + // if cast succeeds there is an implementation so no need to check + ret = Internal::GetImplementation( control ).OnAccessibilityActivated(); + } } -}; + + return ret; +} /** - * Helper function to calculate a dimension given the policy of that dimension; the minimum & - * maximum values that dimension can be; and the allocated value for that dimension. - * - * @param[in] policy The size policy for that dimension. - * @param[in] minimum The minimum value that dimension can be. - * @param[in] maximum The maximum value that dimension can be. - * @param[in] allocated The value allocated for that dimension. - * - * @return The value that the dimension should be. - * - * @note This does not handle Control::Fixed policy. + * Connects a callback function with the object's signals. + * @param[in] object The object providing the signal. + * @param[in] tracker Used to disconnect the signal. + * @param[in] signalName The signal to connect to. + * @param[in] functor A newly allocated FunctorDelegate. + * @return True if the signal was connected. + * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. */ -float Calculate( Control::SizePolicy policy, float minimum, float maximum, float allocated ) +const char* SIGNAL_KEY_EVENT = "key-event"; +const char* SIGNAL_KEY_INPUT_FOCUS_GAINED = "key-input-focus-gained"; +const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "key-input-focus-lost"; +const char* SIGNAL_TAPPED = "tapped"; +const char* SIGNAL_PANNED = "panned"; +const char* SIGNAL_PINCHED = "pinched"; +const char* SIGNAL_LONG_PRESSED = "long-pressed"; +static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { - float size( allocated ); + Dali::BaseHandle handle( object ); - switch( policy ) + bool connected( false ); + Toolkit::Control control = Toolkit::Control::DownCast( handle ); + if ( control ) { - case Control::Fixed: + Internal::Control& controlImpl( Internal::GetImplementation( control ) ); + connected = true; + + if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) { - // Use allocated value - break; + controlImpl.KeyEventSignal().Connect( tracker, functor ); } - - case Control::Minimum: + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED ) ) { - // Size is always at least the minimum. - size = std::max( allocated, minimum ); - break; + controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor ); } - - case Control::Maximum: + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) ) { - // Size can grow but up to a maximum value. - size = std::min( allocated, maximum ); - break; + controlImpl.KeyInputFocusLostSignal().Connect( tracker, functor ); } - - case Control::Range: + else if( 0 == strcmp( signalName.c_str(), SIGNAL_TAPPED ) ) { - // Size is at least the minimum and can grow up to the maximum - size = std::max( size, minimum ); - size = std::min( size, maximum ); - break; + controlImpl.EnableGestureDetection( Gesture::Tap ); + controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor ); } - - case Control::Flexible: + else if( 0 == strcmp( signalName.c_str(), SIGNAL_PANNED ) ) + { + controlImpl.EnableGestureDetection( Gesture::Pan ); + controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_PINCHED ) ) { - // Size grows or shrinks with no limits. - size = allocated; - break; + controlImpl.EnableGestureDetection( Gesture::Pinch ); + controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor ); } - - default: + else if( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESSED ) ) { - DALI_ASSERT_DEBUG( false && "This function was not intended to be used by any other policy." ); - break; + controlImpl.EnableGestureDetection( Gesture::LongPress ); + controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor ); } } - - return size; + return connected; } +// Setup signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); + +// Note: Properties are registered separately below. + +SignalConnectorType registerSignal1( typeRegistration, SIGNAL_KEY_EVENT, &DoConnectSignal ); +SignalConnectorType registerSignal2( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_GAINED, &DoConnectSignal ); +SignalConnectorType registerSignal3( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_LOST, &DoConnectSignal ); +SignalConnectorType registerSignal4( typeRegistration, SIGNAL_TAPPED, &DoConnectSignal ); +SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnectSignal ); +SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal ); +SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal ); + +TypeAction registerAction( typeRegistration, ACTION_CONTROL_ACTIVATED, &DoAction ); + +DALI_TYPE_REGISTRATION_END() + +/** + * Structure which holds information about the background of a control + */ +struct Background +{ + Actor actor; ///< Either a MeshActor or an ImageActor + Vector4 color; ///< The color of the actor. + + /** + * Constructor + */ + Background() + : actor(), + color( Color::WHITE ) + { + } +}; + /** * Creates a white coloured Mesh. */ @@ -217,20 +217,36 @@ Mesh CreateMesh() * Sets all the required properties for the background actor. * * @param[in] actor The actor to set the properties on. + * @param[in] color The required color of the actor. + */ +void SetupBackgroundActor( Actor actor, const Vector4& color ) +{ + actor.SetColor( color ); + actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); + actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); + actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); + actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); +} + +/** + * Sets all the required properties for the background actor. + * + * @param[in] actor The actor to set the properties on. * @param[in] constrainingIndex The property index to constrain the parent's size on. * @param[in] color The required color of the actor. */ -void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const Vector4& color ) +void SetupBackgroundActorConstrained( Actor actor, Property::Index constrainingIndex, const Vector4& color ) { actor.SetColor( color ); actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); - Constraint constraint = Constraint::New( constrainingIndex, - ParentSource( Actor::SIZE ), + Constraint constraint = Constraint::New( actor, + constrainingIndex, EqualToConstraint() ); - actor.ApplyConstraint( constraint ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.Apply(); } } // unnamed namespace @@ -242,19 +258,10 @@ class Control::Impl : public ConnectionTracker { public: - /** - * Size indices for mMinMaxSize array - */ - enum - { - MIN_SIZE_INDEX = 0, - MAX_SIZE_INDEX = 1 - }; - -public: // Construction & Destruction Impl(Control& controlImpl) : mControlImpl( controlImpl ), + mStyleName(""), mBackground( NULL ), mStartingPinchScale( NULL ), mKeyEventSignal(), @@ -262,15 +269,9 @@ public: mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), - mWidthPolicy( Toolkit::Control::Fixed ), - mHeightPolicy( Toolkit::Control::Fixed ), - mFlags( Control::CONTROL_BEHAVIOUR_NONE ), - mInsideRelayout( false ), + mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mInitialized( false ) + mIsKeyboardFocusGroup( false ) { } @@ -332,17 +333,23 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { - case Toolkit::Control::PROPERTY_BACKGROUND_COLOR: + case Toolkit::Control::Property::STYLE_NAME: + { + controlImpl.SetStyleName( value.Get< std::string >() ); + break; + } + + case Toolkit::Control::Property::BACKGROUND_COLOR: { controlImpl.SetBackgroundColor( value.Get< Vector4 >() ); break; } - case Toolkit::Control::PROPERTY_BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { if ( value.HasKey( "image" ) ) { @@ -351,7 +358,7 @@ public: if ( image ) { - controlImpl.SetBackground( image ); + controlImpl.SetBackgroundImage( image ); } } else if ( value.Get< Property::Map >().Empty() ) @@ -362,31 +369,7 @@ public: break; } - case Toolkit::Control::PROPERTY_WIDTH_POLICY: - { - controlImpl.mImpl->mWidthPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >().c_str(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ); - break; - } - - case Toolkit::Control::PROPERTY_HEIGHT_POLICY: - { - controlImpl.mImpl->mHeightPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >().c_str(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ); - break; - } - - case Toolkit::Control::PROPERTY_MINIMUM_SIZE: - { - controlImpl.SetMinimumSize( value.Get< Vector3 >() ); - break; - } - - case Toolkit::Control::PROPERTY_MAXIMUM_SIZE: - { - controlImpl.SetMaximumSize( value.Get< Vector3 >() ); - break; - } - - case Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS: + case Toolkit::Control::Property::KEY_INPUT_FOCUS: { if ( value.Get< bool >() ) { @@ -416,24 +399,30 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { - case Toolkit::Control::PROPERTY_BACKGROUND_COLOR: + case Toolkit::Control::Property::STYLE_NAME: + { + value = controlImpl.GetStyleName(); + break; + } + + case Toolkit::Control::Property::BACKGROUND_COLOR: { value = controlImpl.GetBackgroundColor(); break; } - case Toolkit::Control::PROPERTY_BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { Property::Map map; - Actor actor = controlImpl.GetBackgroundActor(); - if ( actor ) + Background* back = controlImpl.mImpl->mBackground; + if( back ) { - ImageActor imageActor = ImageActor::DownCast( actor ); + ImageActor imageActor = ImageActor::DownCast( back->actor ); if ( imageActor ) { Image image = imageActor.GetImage(); @@ -447,31 +436,7 @@ public: break; } - case Toolkit::Control::PROPERTY_WIDTH_POLICY: - { - value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mWidthPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) ); - break; - } - - case Toolkit::Control::PROPERTY_HEIGHT_POLICY: - { - value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mHeightPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) ); - break; - } - - case Toolkit::Control::PROPERTY_MINIMUM_SIZE: - { - value = controlImpl.mImpl->GetMinimumSize(); - break; - } - - case Toolkit::Control::PROPERTY_MAXIMUM_SIZE: - { - value = controlImpl.mImpl->GetMaximumSize(); - break; - } - - case Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS: + case Toolkit::Control::Property::KEY_INPUT_FOCUS: { value = controlImpl.HasKeyInputFocus(); break; @@ -482,126 +447,43 @@ public: return value; } - /** - * Helper to get minimum size - * @return minimum size - */ - inline const Vector3& GetMinimumSize() - { - if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - return mMinMaxSize[ MIN_SIZE_INDEX ]; - } - else - { - // its not been allocated so its ZERO - return Vector3::ZERO; - } - } - /** - * Helper to Set minimum size - * @param size to set - */ - inline void SetMinimumSize( const Vector3& size ) - { - if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - mMinMaxSize[ MIN_SIZE_INDEX ] = size; - } - else - { - // its not been allocated so push the new value there - mMinMaxSize.PushBack( size ); - } - } - - /** - * Helper to get maximum size - * @return maximum size - */ - inline const Vector3& GetMaximumSize() - { - if( mMinMaxSize.Count() > MAX_SIZE_INDEX ) - { - return mMinMaxSize[ MAX_SIZE_INDEX ]; - } - else - { - // its not been allocated so its MAX_SIZE - return MAX_SIZE; - } - } - - /** - * Helper to Set minimum size - * @param size to set - */ - inline void SetMaximumSize( const Vector3& size ) - { - if( mMinMaxSize.Count() > MAX_SIZE_INDEX ) - { - mMinMaxSize[ MAX_SIZE_INDEX ] = size; - } - else if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - // max has not been allocated, but min has - mMinMaxSize.PushBack( size ); - } - else - { - // min and max both unallocated so allocate both - mMinMaxSize.Resize( 2u ); // this will reserve and default construct two Vector3s - mMinMaxSize[ MAX_SIZE_INDEX ] = size; - } - } - // Data Control& mControlImpl; + std::string mStyleName; Background* mBackground; ///< Only create the background if we use it Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; + Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal; + Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusLostSignal; // Gesture Detection PinchGestureDetector mPinchGestureDetector; PanGestureDetector mPanGestureDetector; TapGestureDetector mTapGestureDetector; LongPressGestureDetector mLongPressGestureDetector; - // @todo change all these to Vector2 when we have a chance to sanitize the public API as well - Vector3 mCurrentSize; ///< Stores the current control's size, this is the negotiated size - Vector3 mNaturalSize; ///< Stores the size set through the Actor's API. This is size the actor wants to be. Useful when reset to the initial size is needed. - Dali::Vector< Vector3 > mMinMaxSize; ///< Stores the minimum and maximum size if they are set - - Toolkit::Control::SizePolicy mWidthPolicy :3; ///< Stores the width policy. 3 bits covers 8 values - Toolkit::Control::SizePolicy mHeightPolicy :3; ///< Stores the height policy. 3 bits covers 8 values - ControlBehaviour mFlags :6; ///< Flags passed in from constructor. Need to increase this size when new enums are added - bool mInsideRelayout:1; ///< Detect when were in Relayout - bool mIsKeyboardNavigationSupported:1; ///< Stores whether keyboard navigation is supported by the control. - bool mIsKeyboardFocusGroup:1; ///< Stores whether the control is a focus group. - bool mInitialized:1; - - // Properties - these need to be members of Internal::Control::Impl as they need to functions within this class. + + ControlBehaviour mFlags :CONTROL_BEHAVIOUR_FLAG_COUNT; ///< Flags passed in from constructor. + bool mIsKeyboardNavigationSupported :1; ///< Stores whether keyboard navigation is supported by the control. + bool mIsKeyboardFocusGroup :1; ///< Stores whether the control is a focus group. + + // Properties - these need to be members of Internal::Control::Impl as they need to function within this class. static PropertyRegistration PROPERTY_1; static PropertyRegistration PROPERTY_2; static PropertyRegistration PROPERTY_3; static PropertyRegistration PROPERTY_4; - static PropertyRegistration PROPERTY_5; - static PropertyRegistration PROPERTY_6; - static PropertyRegistration PROPERTY_7; }; -PropertyRegistration Control::Impl::PROPERTY_1( CONTROL_TYPE, "background-color", Toolkit::Control::PROPERTY_BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_2( CONTROL_TYPE, "background", Toolkit::Control::PROPERTY_BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_3( CONTROL_TYPE, "width-policy", Toolkit::Control::PROPERTY_WIDTH_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_4( CONTROL_TYPE, "height-policy", Toolkit::Control::PROPERTY_HEIGHT_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_5( CONTROL_TYPE, "minimum-size", Toolkit::Control::PROPERTY_MINIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_6( CONTROL_TYPE, "maximum-size", Toolkit::Control::PROPERTY_MAXIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_7( CONTROL_TYPE, "key-input-focus", Toolkit::Control::PROPERTY_KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +// Properties registered without macro to use specific member variables. +PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "style-name", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "background-color", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "background-image", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "key-input-focus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); Toolkit::Control Control::New() { // Create the implementation, temporarily owned on stack - IntrusivePtr controlImpl = new Control( CONTROL_BEHAVIOUR_NONE ); + IntrusivePtr controlImpl = new Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ); // Pass ownership to handle Toolkit::Control handle( *controlImpl ); @@ -618,136 +500,142 @@ Control::~Control() delete mImpl; } -void Control::SetSizePolicy( Toolkit::Control::SizePolicy widthPolicy, Toolkit::Control::SizePolicy heightPolicy ) +void Control::SetStyleName( const std::string& styleName ) { - bool relayoutRequest( false ); - - if ( ( mImpl->mWidthPolicy != widthPolicy ) || ( mImpl->mHeightPolicy != heightPolicy ) ) + if( styleName != mImpl->mStyleName ) { - relayoutRequest = true; - } + mImpl->mStyleName = styleName; - mImpl->mWidthPolicy = widthPolicy; - mImpl->mHeightPolicy = heightPolicy; - - // Ensure RelayoutRequest is called AFTER new policies have been set. - if ( relayoutRequest ) - { - RelayoutRequest(); + // Apply new style + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } } -void Control::GetSizePolicy( Toolkit::Control::SizePolicy& widthPolicy, Toolkit::Control::SizePolicy& heightPolicy ) const +const std::string& Control::GetStyleName() const { - widthPolicy = mImpl->mWidthPolicy; - heightPolicy = mImpl->mHeightPolicy; + return mImpl->mStyleName; } -void Control::SetMinimumSize( const Vector3& size ) +void Control::SetBackgroundColor( const Vector4& color ) { - const Vector3& minSize = mImpl->GetMinimumSize(); - if ( fabsf( minSize.width - size.width ) > Math::MACHINE_EPSILON_1000 || - fabsf( minSize.height - size.height ) > Math::MACHINE_EPSILON_1000 ) - { - mImpl->SetMinimumSize( size ); + Background& background( mImpl->GetBackground() ); - // Only relayout if our control is using the minimum or range policy. - if ( ( mImpl->mHeightPolicy == Toolkit::Control::Minimum ) || ( mImpl->mWidthPolicy == Toolkit::Control::Minimum ) || - ( mImpl->mHeightPolicy == Toolkit::Control::Range ) || ( mImpl->mWidthPolicy == Toolkit::Control::Range ) ) - { - RelayoutRequest(); - } + if ( background.actor ) + { + // Just set the actor color + background.actor.SetColor( color ); } -} - -const Vector3& Control::GetMinimumSize() const -{ - return mImpl->GetMinimumSize(); -} - -void Control::SetMaximumSize( const Vector3& size ) -{ - const Vector3& maxSize = mImpl->GetMaximumSize(); - if ( fabsf( maxSize.width - size.width ) > Math::MACHINE_EPSILON_1000 || - fabsf( maxSize.height - size.height ) > Math::MACHINE_EPSILON_1000 ) + else { - mImpl->SetMaximumSize( size ); + // Create Mesh Actor + MeshActor meshActor = MeshActor::New( CreateMesh() ); - // Only relayout if our control is using the maximum or range policy. - if ( ( mImpl->mHeightPolicy == Toolkit::Control::Maximum ) || ( mImpl->mWidthPolicy == Toolkit::Control::Maximum ) || - ( mImpl->mHeightPolicy == Toolkit::Control::Range ) || ( mImpl->mWidthPolicy == Toolkit::Control::Range ) ) - { - RelayoutRequest(); - } - } -} + SetupBackgroundActorConstrained( meshActor, Actor::Property::SCALE, color ); -const Vector3& Control::GetMaximumSize() const -{ - return mImpl->GetMaximumSize(); -} + // Set the background actor before adding so that we do not inform deriving classes + background.actor = meshActor; + Self().Add( meshActor ); + } -Vector3 Control::GetNaturalSize() -{ - // could be overridden in derived classes. - return mImpl->mNaturalSize; + background.color = color; } -float Control::GetHeightForWidth( float width ) +Vector4 Control::GetBackgroundColor() const { - // could be overridden in derived classes. - float height( 0.0f ); - if ( mImpl->mNaturalSize.width > 0.0f ) + if ( mImpl->mBackground ) { - height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width; + return mImpl->mBackground->color; } - return height; + return Color::TRANSPARENT; } -float Control::GetWidthForHeight( float height ) +void Control::SetBackgroundImage( Image image ) { - // could be overridden in derived classes. - float width( 0.0f ); - if ( mImpl->mNaturalSize.height > 0.0f ) + Background& background( mImpl->GetBackground() ); + + if ( background.actor ) { - width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height; + // Remove Current actor, unset AFTER removal so that we do not inform deriving classes + Self().Remove( background.actor ); + background.actor.Reset(); } - return width; -} -const Vector3& Control::GetControlSize() const -{ - return mImpl->mCurrentSize; -} + ImageActor imageActor = ImageActor::New( image ); + SetupBackgroundActor( imageActor, background.color ); -const Vector3& Control::GetSizeSet() const -{ - return mImpl->mNaturalSize; + // Set the background actor before adding so that we do not inform derived classes + background.actor = imageActor; + Self().Add( imageActor ); } -void Control::SetKeyInputFocus() +void Control::ClearBackground() { - if( Self().OnStage() ) + if ( mImpl->mBackground ) { - Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); + Background& background( mImpl->GetBackground() ); + Self().Remove( background.actor ); + + delete mImpl->mBackground; + mImpl->mBackground = NULL; } } -bool Control::HasKeyInputFocus() +void Control::EnableGestureDetection(Gesture::Type type) { - bool result = false; - if( Self().OnStage() ) + if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) { - result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); + mImpl->mPinchGestureDetector = PinchGestureDetector::New(); + mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); + mImpl->mPinchGestureDetector.Attach(Self()); + } + + if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) + { + mImpl->mPanGestureDetector = PanGestureDetector::New(); + mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); + mImpl->mPanGestureDetector.Attach(Self()); + } + + if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) + { + mImpl->mTapGestureDetector = TapGestureDetector::New(); + mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); + mImpl->mTapGestureDetector.Attach(Self()); + } + + if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) + { + mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); + mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); + mImpl->mLongPressGestureDetector.Attach(Self()); } - return result; } -void Control::ClearKeyInputFocus() +void Control::DisableGestureDetection(Gesture::Type type) { - if( Self().OnStage() ) + if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) { - Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); + mImpl->mPinchGestureDetector.Detach(Self()); + mImpl->mPinchGestureDetector.Reset(); + } + + if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector ) + { + mImpl->mPanGestureDetector.Detach(Self()); + mImpl->mPanGestureDetector.Reset(); + } + + if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector ) + { + mImpl->mTapGestureDetector.Detach(Self()); + mImpl->mTapGestureDetector.Reset(); + } + + if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) + { + mImpl->mLongPressGestureDetector.Detach(Self()); + mImpl->mLongPressGestureDetector.Reset(); } } @@ -771,95 +659,64 @@ LongPressGestureDetector Control::GetLongPressGestureDetector() const return mImpl->mLongPressGestureDetector; } -void Control::SetBackgroundColor( const Vector4& color ) +void Control::SetKeyboardNavigationSupport(bool isSupported) { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) - { - // Just set the actor color - background.actor.SetColor( color ); - } - else - { - // Create Mesh Actor - MeshActor meshActor = MeshActor::New( CreateMesh() ); - - meshActor.SetAffectedByLighting( false ); - SetupBackgroundActor( meshActor, Actor::SCALE, color ); - - // Set the background actor before adding so that we do not inform deriving classes - background.actor = meshActor; - Self().Add( meshActor ); - } + mImpl->mIsKeyboardNavigationSupported = isSupported; +} - background.color = color; +bool Control::IsKeyboardNavigationSupported() +{ + return mImpl->mIsKeyboardNavigationSupported; } -Vector4 Control::GetBackgroundColor() const +void Control::SetKeyInputFocus() { - if ( mImpl->mBackground ) + if( Self().OnStage() ) { - return mImpl->mBackground->color; + Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); } - return Color::TRANSPARENT; } -void Control::SetBackground( Image image ) +bool Control::HasKeyInputFocus() { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) + bool result = false; + if( Self().OnStage() ) { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes - Self().Remove( background.actor ); - background.actor.Reset(); + result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); } - - ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, Actor::SIZE, background.color ); - - // Set the background actor before adding so that we do not inform derived classes - background.actor = imageActor; - Self().Add( imageActor ); + return result; } -void Control::ClearBackground() +void Control::ClearKeyInputFocus() { - if ( mImpl->mBackground ) + if( Self().OnStage() ) { - Background& background( mImpl->GetBackground() ); - Self().Remove( background.actor ); - - delete mImpl->mBackground; - mImpl->mBackground = NULL; + Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); } } -Actor Control::GetBackgroundActor() const +void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) { - if ( mImpl->mBackground ) - { - return mImpl->mBackground->actor; - } + mImpl->mIsKeyboardFocusGroup = isFocusGroup; - return Actor(); + // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted + Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup); } -void Control::SetKeyboardNavigationSupport(bool isSupported) +bool Control::IsKeyboardFocusGroup() { - mImpl->mIsKeyboardNavigationSupported = isSupported; + return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self()); } -bool Control::IsKeyboardNavigationSupported() +void Control::AccessibilityActivate() { - return mImpl->mIsKeyboardNavigationSupported; + // Inform deriving classes + OnAccessibilityActivated(); } -void Control::Activate() +bool Control::OnAccessibilityActivated() { - // Inform deriving classes - OnActivated(); + return false; // Accessibility activation is not handled by default } bool Control::OnAccessibilityPan(PanGesture gesture) @@ -877,130 +734,7 @@ bool Control::OnAccessibilityValueChange(bool isIncrease) return false; // Accessibility value change action is not handled by default } -void Control::NegotiateSize( const Vector2& allocatedSize, ActorSizeContainer& container ) -{ - Vector2 size; - - if ( mImpl->mWidthPolicy == Toolkit::Control::Fixed ) - { - if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed ) - { - // If a control says it has a fixed size, then use the size set by the application / control. - Vector2 setSize( mImpl->mNaturalSize ); - if ( setSize != Vector2::ZERO ) - { - size = setSize; - - // Policy is set to Fixed, so if the application / control has not set one of the dimensions, - // then we should use the natural size of the control rather than the full allocation. - if ( EqualsZero( size.width ) ) - { - size.width = GetWidthForHeight( size.height ); - } - else if ( EqualsZero( size.height ) ) - { - size.height = GetHeightForWidth( size.width ); - } - } - else - { - // If that is not set then set the size to the control's natural size - size = Vector2( GetNaturalSize() ); - } - } - else - { - // Width is fixed so if the application / control has set it, then use that. - if ( !EqualsZero( mImpl->mNaturalSize.width ) ) - { - size.width = mImpl->mNaturalSize.width; - } - else - { - // Otherwise, set the width to what has been allocated. - size.width = allocatedSize.width; - } - - // Height is flexible so ask control what the height should be for our width. - size.height = GetHeightForWidth( size.width ); - - // Ensure height is within our policy rules - size.height = Calculate( mImpl->mHeightPolicy, GetMinimumSize().height, GetMaximumSize().height, size.height ); - } - } - else - { - if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed ) - { - // Height is fixed so if the application / control has set it, then use that. - if ( !EqualsZero( mImpl->mNaturalSize.height ) ) - { - size.height = mImpl->mNaturalSize.height; - } - else - { - // Otherwise, set the height to what has been allocated. - size.height = allocatedSize.height; - } - - // Width is flexible so ask control what the width should be for our height. - size.width = GetWidthForHeight( size.height ); - - // Ensure width is within our policy rules - size.width = Calculate( mImpl->mWidthPolicy, mImpl->GetMinimumSize().width, mImpl->GetMaximumSize().width, size.width ); - } - else - { - // Width and height are BOTH flexible. - // Calculate the width and height using the policy rules. - size.width = Calculate( mImpl->mWidthPolicy, mImpl->GetMinimumSize().width, mImpl->GetMaximumSize().width, allocatedSize.width ); - size.height = Calculate( mImpl->mHeightPolicy, mImpl->GetMinimumSize().height, mImpl->GetMaximumSize().height, allocatedSize.height ); - } - } - - // If the width has not been set, then set to the allocated width. - // Also if the width set is greater than the allocated, then set to allocated (no exceed support). - if ( EqualsZero( size.width ) || ( size.width > allocatedSize.width ) ) - { - size.width = allocatedSize.width; - } - - // If the height has not been set, then set to the allocated height. - // Also if the height set is greater than the allocated, then set to allocated (no exceed support). - if ( EqualsZero( size.height ) || ( size.height > allocatedSize.height ) ) - { - size.height = allocatedSize.height; - } - - DALI_LOG_INFO( gLogFilter, Debug::Verbose, - "%p: Natural: [%.2f, %.2f] Allocated: [%.2f, %.2f] Set: [%.2f, %.2f]\n", - Self().GetObjectPtr(), - GetNaturalSize().x, GetNaturalSize().y, - allocatedSize.x, allocatedSize.y, - size.x, size.y ); - - // Avoids relayout again when OnSizeSet callback arrives as a function of us or deriving class calling SetSize() - mImpl->mInsideRelayout = true; - Self().SetSize( size ); - // Only relayout controls which requested to be relaid out. - OnRelayout( size, container ); - mImpl->mInsideRelayout = false; -} - -void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) -{ - mImpl->mIsKeyboardFocusGroup = isFocusGroup; - - // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted - Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup); -} - -bool Control::IsKeyboardFocusGroup() -{ - return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self()); -} - -Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) +Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) { return Actor(); } @@ -1009,70 +743,19 @@ void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) { } -bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) +Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() { - bool ret = false; - - if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) ) - { - Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); - if( control ) - { - // if cast succeeds there is an implementation so no need to check - control.GetImplementation().OnActivated(); - } - } - - return ret; + return mImpl->mKeyEventSignal; } -bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusGainedSignal() { - Dali::BaseHandle handle( object ); - - bool connected( false ); - Toolkit::Control control = Toolkit::Control::DownCast( handle ); - if ( control ) - { - Control& controlImpl( control.GetImplementation() ); - connected = true; - - if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) - { - controlImpl.KeyEventSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_TAPPED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Tap ); - controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_PANNED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Pan ); - controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_PINCHED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Pinch ); - controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESSED ) ) - { - controlImpl.EnableGestureDetection( Gesture::LongPress ); - controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else - { - // signalName does not match any signal - connected = false; - } - } - return connected; + return mImpl->mKeyInputFocusGainedSignal; } -Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() +Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusLostSignal() { - return mImpl->mKeyEventSignal; + return mImpl->mKeyInputFocusLostSignal; } bool Control::EmitKeyEventSignal( const KeyEvent& event ) @@ -1098,7 +781,7 @@ bool Control::EmitKeyEventSignal( const KeyEvent& event ) } Control::Control( ControlBehaviour behaviourFlags ) -: CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ), +: CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ), mImpl(new Impl(*this)) { mImpl->mFlags = behaviourFlags; @@ -1106,126 +789,45 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - - // Calling deriving classes - OnInitialize(); - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::DoStyleChange ); + styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); // SetTheme GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } - SetRequiresHoverEvents(mImpl->mFlags & REQUIRES_HOVER_EVENTS); - SetRequiresMouseWheelEvents(mImpl->mFlags & REQUIRES_MOUSE_WHEEL_EVENTS); - - mImpl->mInitialized = true; -} - -void Control::EnableGestureDetection(Gesture::Type type) -{ - if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) - { - mImpl->mPinchGestureDetector = PinchGestureDetector::New(); - mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); - mImpl->mPinchGestureDetector.Attach(Self()); - } - - if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) - { - mImpl->mPanGestureDetector = PanGestureDetector::New(); - mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); - mImpl->mPanGestureDetector.Attach(Self()); - } - - if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) - { - mImpl->mTapGestureDetector = TapGestureDetector::New(); - mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); - mImpl->mTapGestureDetector.Attach(Self()); - } - - if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) - { - mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); - mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); - mImpl->mLongPressGestureDetector.Attach(Self()); - } -} - -void Control::DisableGestureDetection(Gesture::Type type) -{ - if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) - { - mImpl->mPinchGestureDetector.Detach(Self()); - mImpl->mPinchGestureDetector.Reset(); - } - - if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector ) - { - mImpl->mPanGestureDetector.Detach(Self()); - mImpl->mPanGestureDetector.Reset(); - } - - if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector ) - { - mImpl->mTapGestureDetector.Detach(Self()); - mImpl->mTapGestureDetector.Reset(); - } - - if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) - { - mImpl->mLongPressGestureDetector.Detach(Self()); - mImpl->mLongPressGestureDetector.Reset(); - } -} - -void Control::RelayoutRequest() -{ - // unfortunate double negative but thats to guarantee new controls get size negotiation - // by default and have to "opt-out" if they dont want it - if( !(mImpl->mFlags & NO_SIZE_NEGOTIATION) ) + if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { - Internal::RelayoutController::Request(); + SetKeyboardNavigationSupport( true ); } -} -void Control::Relayout( Actor actor, const Vector2& size, ActorSizeContainer& container ) -{ - if ( actor ) - { - Toolkit::Control control( Toolkit::Control::DownCast( actor ) ); - if( control ) - { - control.GetImplementation().NegotiateSize( size, container ); - } - else - { - container.push_back( ActorSizePair( actor, size ) ); - } - } + // Calling deriving classes + OnInitialize(); } void Control::OnInitialize() { } -void Control::OnActivated() +void Control::OnControlChildAdd( Actor& child ) { } -void Control::OnThemeChange( Toolkit::StyleManager styleManager ) +void Control::OnControlChildRemove( Actor& child ) { - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } -void Control::OnFontChange( bool defaultFontChange, bool defaultFontSizeChange ) +void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { + // By default the control is only interested in theme (not font) changes + if( change == StyleChange::THEME_CHANGE ) + { + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + } } void Control::OnPinch(const PinchGesture& pinch) @@ -1256,49 +858,78 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlStageConnection() +void Control::EmitKeyInputFocusSignal( bool focusGained ) { + Dali::Toolkit::Control handle( GetOwner() ); + + if ( focusGained ) + { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusGainedSignal.Empty() ) + { + mImpl->mKeyInputFocusGainedSignal.Emit( handle ); + } + } + else + { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusLostSignal.Empty() ) + { + mImpl->mKeyInputFocusLostSignal.Emit( handle ); + } + } } -void Control::OnControlStageDisconnection() +void Control::OnStageConnection() { } -void Control::OnControlChildAdd( Actor& child ) +void Control::OnStageDisconnection() { } -void Control::OnControlChildRemove( Actor& child ) +void Control::OnKeyInputFocusGained() { + EmitKeyInputFocusSignal( true ); } -void Control::OnControlSizeSet( const Vector3& size ) +void Control::OnKeyInputFocusLost() { + EmitKeyInputFocusSignal( false ); } -void Control::OnRelayout( const Vector2& size, ActorSizeContainer& container ) +void Control::OnChildAdd(Actor& child) { - unsigned int numChildren = Self().GetChildCount(); - - for( unsigned int i=0; imBackground && ( child == mImpl->mBackground->actor ) ) { - container.push_back( ActorSizePair( Self().GetChildAt(i), size ) ); + return; } + + // Notify derived classes. + OnControlChildAdd( child ); } -void Control::OnKeyInputFocusGained() +void Control::OnChildRemove(Actor& child) { - // Do Nothing + // If this is the background actor, then we do not want to relayout or inform deriving classes + if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) + { + return; + } + + // Notify derived classes. + OnControlChildRemove( child ); } -void Control::OnKeyInputFocusLost() +void Control::OnSizeSet(const Vector3& targetSize) { - // Do Nothing + // Background is resized through size negotiation } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { - // @todo consider animating negotiated child sizes to target size + // @todo size negotiate background to new size, animate as well? } bool Control::OnTouchEvent(const TouchEvent& event) @@ -1316,76 +947,78 @@ bool Control::OnKeyEvent(const KeyEvent& event) return false; // Do not consume } -bool Control::OnMouseWheelEvent(const MouseWheelEvent& event) +bool Control::OnWheelEvent(const WheelEvent& event) { return false; // Do not consume } -Actor Control::GetChildByAlias(const std::string& actorAlias) +void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - return Actor(); + for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) + { + container.Add( Self().GetChildAt( i ), size ); + } } -void Control::OnStageConnection() +void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { - RelayoutRequest(); +} - // Notify derived classes. - OnControlStageConnection(); +Vector3 Control::GetNaturalSize() +{ + if( mImpl->mBackground ) + { + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetNaturalSize(); + } + } + return Vector3(); } -void Control::OnStageDisconnection() +float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) { - // Notify derived classes - OnControlStageDisconnection(); + return CalculateChildSizeBase( child, dimension ); } -void Control::OnChildAdd(Actor& child) +float Control::GetHeightForWidth( float width ) { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) + if( mImpl->mBackground ) { - return; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetHeightForWidth( width ); + } } - - // Request for relayout as we may need to position the new child and old ones - RelayoutRequest(); - - // Notify derived classes. - OnControlChildAdd( child ); + return GetHeightForWidthBase( width ); } -void Control::OnChildRemove(Actor& child) +float Control::GetWidthForHeight( float height ) { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) + if( mImpl->mBackground ) { - return; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetWidthForHeight( height ); + } } - - // Request for relayout as we may need to re-position the old child - RelayoutRequest(); - - // Notify derived classes. - OnControlChildRemove( child ); + return GetWidthForHeightBase( height ); } -void Control::OnSizeSet(const Vector3& targetSize) +bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) { - if( ( !mImpl->mInsideRelayout ) && ( targetSize != mImpl->mNaturalSize ) ) - { - // Only updates size if set through Actor's API - mImpl->mNaturalSize = targetSize; - } + return RelayoutDependentOnChildrenBase( dimension ); +} - if( targetSize != mImpl->mCurrentSize ) - { - // Update control size. - mImpl->mCurrentSize = targetSize; +void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) +{ +} - // Notify derived classes. - OnControlSizeSet( targetSize ); - } +void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) +{ } void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) @@ -1398,16 +1031,20 @@ void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* call mImpl->SignalDisconnected( slotObserver, callback ); } -void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +Control& GetImplementation( Dali::Toolkit::Control& handle ) { - if( change.themeChange ) - { - OnThemeChange( styleManager ); - } - else if( change.defaultFontChange || change.defaultFontSizeChange ) - { - OnFontChange( change.defaultFontChange, change.defaultFontSizeChange ); - } + CustomActorImpl& customInterface = handle.GetImplementation(); + // downcast to control + Control& impl = dynamic_cast< Internal::Control& >( customInterface ); + return impl; +} + +const Control& GetImplementation( const Dali::Toolkit::Control& handle ) +{ + const CustomActorImpl& customInterface = handle.GetImplementation(); + // downcast to control + const Control& impl = dynamic_cast< const Internal::Control& >( customInterface ); + return impl; } } // namespace Internal