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=6d1a28d0dfd8d054978eb175248977e037a0e612;hp=17161d016045e70e2cf4ebb0cb59a9ed9b3fc9b5;hb=0ccf79d8c24cc732f22d9c80cb089d70883aa363;hpb=e4e5db1d2d7997e7bf803a531048d8dcb959083b diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 17161d0..6d1a28d 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -22,23 +22,24 @@ #include // for strcmp #include #include -#include -#include #include #include -#include #include -#include -#include #include +#include +#include +#include #include // INTERNAL INCLUDES -#include +#include +#include +#include #include #include -#include +#include #include +#include namespace Dali { @@ -49,120 +50,121 @@ namespace Toolkit namespace { -#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(); } -// Setup signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); - -// Note: Properties are registered separately below, - -DALI_SIGNAL_REGISTRATION( Control, "key-event", SIGNAL_KEY_EVENT ) -DALI_SIGNAL_REGISTRATION( Control, "key-input-focus-gained", SIGNAL_KEY_INPUT_FOCUS_GAINED ) -DALI_SIGNAL_REGISTRATION( Control, "key-input-focus-lost", SIGNAL_KEY_INPUT_FOCUS_LOST ) -DALI_SIGNAL_REGISTRATION( Control, "tapped", SIGNAL_TAPPED ) -DALI_SIGNAL_REGISTRATION( Control, "panned", SIGNAL_PANNED ) -DALI_SIGNAL_REGISTRATION( Control, "pinched", SIGNAL_PINCHED ) -DALI_SIGNAL_REGISTRATION( Control, "long-pressed", SIGNAL_LONG_PRESSED ) - -DALI_ACTION_REGISTRATION( Control, "control-activated", ACTION_CONTROL_ACTIVATED ) - -DALI_TYPE_REGISTRATION_END() - /** - * 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_ACCESSIBILITY_ACTIVATED = "accessibilityActivated"; +static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& 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_ACCESSIBILITY_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; +} /** - * Creates a white coloured Mesh. + * 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. */ -Mesh CreateMesh() +const char* SIGNAL_KEY_EVENT = "keyEvent"; +const char* SIGNAL_KEY_INPUT_FOCUS_GAINED = "keyInputFocusGained"; +const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "keyInputFocusLost"; +const char* SIGNAL_TAPPED = "tapped"; +const char* SIGNAL_PANNED = "panned"; +const char* SIGNAL_PINCHED = "pinched"; +const char* SIGNAL_LONG_PRESSED = "longPressed"; +static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { - Vector3 white( Color::WHITE ); + Dali::BaseHandle handle( object ); - MeshData meshData; + bool connected( false ); + Toolkit::Control control = Toolkit::Control::DownCast( handle ); + if ( control ) + { + Internal::Control& controlImpl( Internal::GetImplementation( control ) ); + connected = true; - // Create vertices with a white color (actual color is set by actor color) - MeshData::VertexContainer vertices(4); - vertices[ 0 ] = MeshData::Vertex( Vector3( -0.5f, -0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 1 ] = MeshData::Vertex( Vector3( 0.5f, -0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 2 ] = MeshData::Vertex( Vector3( -0.5f, 0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 3 ] = MeshData::Vertex( Vector3( 0.5f, 0.5f, 0.0f ), Vector2::ZERO, white ); + if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) + { + controlImpl.KeyEventSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED ) ) + { + controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) ) + { + controlImpl.KeyInputFocusLostSignal().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 ); + } + } + return connected; +} - // Specify all the faces - MeshData::FaceIndices faces; - faces.reserve( 6 ); // 2 triangles in Quad - faces.push_back( 0 ); faces.push_back( 3 ); faces.push_back( 1 ); - faces.push_back( 0 ); faces.push_back( 2 ); faces.push_back( 3 ); +// Setup signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); - // Create the mesh data from the vertices and faces - meshData.SetMaterial( Material::New( "ControlMaterial" ) ); - meshData.SetVertices( vertices ); - meshData.SetFaceIndices( faces ); - meshData.SetHasColor( true ); +// Note: Properties are registered separately below. - return Mesh::New( meshData ); -} +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 ); -/** - * 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 ); -} +TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction ); -/** - * 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 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 ); +DALI_TYPE_REGISTRATION_END() - Constraint constraint = Constraint::New( actor, - constrainingIndex, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); -} +const char * const BACKGROUND_COLOR_NAME("color"); +const char * const COLOR_RENDERER_COLOR_NAME("blendColor"); } // unnamed namespace @@ -173,40 +175,27 @@ 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(), - mPinchGestureDetector(), - mPanGestureDetector(), - mTapGestureDetector(), - mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), - mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), - mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mInitialized( false ) - { - } +: mControlImpl( controlImpl ), + mStyleName(""), + mBackgroundRenderer(), + mStartingPinchScale( NULL ), + mKeyEventSignal(), + mPinchGestureDetector(), + mPanGestureDetector(), + mTapGestureDetector(), + mLongPressGestureDetector(), + mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), + mIsKeyboardNavigationSupported( false ), + mIsKeyboardFocusGroup( false ), + mAddRemoveBackgroundChild( false ) +{ +} ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -232,21 +221,6 @@ public: mControlImpl.OnLongPress(longPress); } - // Background Methods - - /** - * Only creates an instance of the background if we actually use it. - * @return A reference to the Background structure. - */ - Background& GetBackground() - { - if ( !mBackground ) - { - mBackground = new Background; - } - return *mBackground; - } - // Properties /** @@ -261,7 +235,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -273,23 +247,20 @@ public: case Toolkit::Control::Property::BACKGROUND_COLOR: { + DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); controlImpl.SetBackgroundColor( value.Get< Vector4 >() ); break; } case Toolkit::Control::Property::BACKGROUND_IMAGE: { - if ( value.HasKey( "image" ) ) + DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); + Image image = Scripting::NewImage( value ); + if ( image ) { - Property::Map imageMap = value.GetValue( "image" ).Get< Property::Map >(); - Image image = Scripting::NewImage( imageMap ); - - if ( image ) - { - controlImpl.SetBackgroundImage( image ); - } + controlImpl.SetBackgroundImage( image ); } - else if ( value.Get< Property::Map >().Empty() ) + else { // An empty map means the background is no longer required controlImpl.ClearBackground(); @@ -309,6 +280,26 @@ public: } break; } + + case Toolkit::Control::Property::BACKGROUND: + { + Image image = Scripting::NewImage( value ); + if ( image ) + { + controlImpl.SetBackgroundImage( image ); + break; + } + const Property::Map* map = value.GetMap(); + if( map ) + { + controlImpl.SetBackground( *map ); + break; + } + + // The background is neither a valid image nor a property map, so it is no longer required + controlImpl.ClearBackground(); + break; + } } } } @@ -327,7 +318,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -339,27 +330,19 @@ public: case Toolkit::Control::Property::BACKGROUND_COLOR: { + DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); value = controlImpl.GetBackgroundColor(); break; } case Toolkit::Control::Property::BACKGROUND_IMAGE: { + DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Property::Map map; - - Actor actor = controlImpl.GetBackgroundActor(); - if ( actor ) + if( controlImpl.mImpl->mBackgroundRenderer ) { - ImageActor imageActor = ImageActor::DownCast( actor ); - if ( imageActor ) - { - Image image = imageActor.GetImage(); - Property::Map imageMap; - Scripting::CreatePropertyMap( image, imageMap ); - map[ "image" ] = imageMap; - } + controlImpl.mImpl->mBackgroundRenderer.CreatePropertyMap( map ); } - value = map; break; } @@ -369,6 +352,19 @@ public: value = controlImpl.HasKeyInputFocus(); break; } + + case Toolkit::Control::Property::BACKGROUND: + { + Property::Map map; + if( controlImpl.mImpl->mBackgroundRenderer ) + { + (controlImpl.mImpl->mBackgroundRenderer).CreatePropertyMap( map ); + } + + value = map; + break; + } + } } @@ -379,7 +375,7 @@ public: Control& mControlImpl; std::string mStyleName; - Background* mBackground; ///< Only create the background if we use it + Toolkit::ControlRenderer mBackgroundRenderer; ///< The control renderer to render the background Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal; @@ -390,27 +386,26 @@ public: 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. 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. - bool mInitialized :1; + bool mAddRemoveBackgroundChild:1; ///< Flag to know when we are adding or removing our own actor to avoid call to OnControlChildAdd // 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 const PropertyRegistration PROPERTY_1; + static const PropertyRegistration PROPERTY_2; + static const PropertyRegistration PROPERTY_3; + static const PropertyRegistration PROPERTY_4; + static const PropertyRegistration PROPERTY_5; }; // 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 ); +const PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "styleName", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "backgroundColor", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "backgroundImage", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "keyInputFocus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); Toolkit::Control Control::New() { @@ -432,78 +427,141 @@ Control::~Control() delete mImpl; } -Vector3 Control::GetNaturalSize() +void Control::SetStyleName( const std::string& styleName ) { - // could be overridden in derived classes. - return mImpl->mNaturalSize; + if( styleName != mImpl->mStyleName ) + { + mImpl->mStyleName = styleName; + + // Apply new style, if stylemanager is available + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + if( styleManager ) + { + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + } + } } -float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) +const std::string& Control::GetStyleName() const { - // Could be overridden in derived classes. - return CalculateChildSizeBase( child, dimension ); + return mImpl->mStyleName; } -bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) +void Control::SetBackgroundColor( const Vector4& color ) { - return RelayoutDependentOnChildrenBase( dimension ); + Actor self( Self() ); + Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, color ); + mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); } -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->mBackgroundRenderer && ( &typeid( GetImplementation(mImpl->mBackgroundRenderer) ) == &typeid( ColorRenderer ) ) ) { - height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width; + Property::Map map; + mImpl->mBackgroundRenderer.CreatePropertyMap( map ); + const Property::Value* colorValue = map.Find( COLOR_RENDERER_COLOR_NAME ); + Vector4 color; + if( colorValue && colorValue->Get(color)) + { + return color; + } } - return height; + + return Color::TRANSPARENT; } -float Control::GetWidthForHeight( float height ) +void Control::SetBackground(const Property::Map& map) { - // could be overridden in derived classes. - float width( 0.0f ); - if ( mImpl->mNaturalSize.height > 0.0f ) + const Property::Value* colorValue = map.Find( BACKGROUND_COLOR_NAME ); + Vector4 color; + if( colorValue && colorValue->Get(color)) + { + SetBackgroundColor( color ); + return; + } + + Actor self( Self() ); + mImpl->mBackgroundRenderer.RemoveAndReset( self ); + Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); + mImpl->mBackgroundRenderer = factory.GetControlRenderer( map ); + if( mImpl->mBackgroundRenderer && self.OnStage() ) // Request control renderer with a property map might return an empty handle { - width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height; + mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); + mImpl->mBackgroundRenderer.SetOnStage( self ); } - return width; } -const Vector3& Control::GetControlSize() const +void Control::SetBackgroundImage( Image image ) { - return mImpl->mCurrentSize; + Actor self( Self() ); + Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, image ); + mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); } -const Vector3& Control::GetSizeSet() const +void Control::ClearBackground() { - return mImpl->mNaturalSize; + Actor self( Self() ); + mImpl->mBackgroundRenderer.RemoveAndReset( self ); } -void Control::SetKeyInputFocus() +void Control::EnableGestureDetection(Gesture::Type type) { - if( Self().OnStage() ) + if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) { - Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); + mImpl->mPinchGestureDetector = PinchGestureDetector::New(); + mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); + mImpl->mPinchGestureDetector.Attach(Self()); } -} -bool Control::HasKeyInputFocus() -{ - bool result = false; - if( Self().OnStage() ) + if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) { - result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); + 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(); } } @@ -527,111 +585,75 @@ LongPressGestureDetector Control::GetLongPressGestureDetector() const return mImpl->mLongPressGestureDetector; } -void Control::SetStyleName( const std::string& styleName ) +void Control::SetKeyboardNavigationSupport(bool isSupported) { - if( styleName != mImpl->mStyleName ) - { - mImpl->mStyleName = styleName; - - // Apply new style - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); - } + mImpl->mIsKeyboardNavigationSupported = isSupported; } -const std::string& Control::GetStyleName() const +bool Control::IsKeyboardNavigationSupported() { - return mImpl->mStyleName; + return mImpl->mIsKeyboardNavigationSupported; } -void Control::SetBackgroundColor( const Vector4& color ) +void Control::SetKeyInputFocus() { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) - { - // Just set the actor color - background.actor.SetColor( color ); - } - else + if( Self().OnStage() ) { - // Create Mesh Actor - MeshActor meshActor = MeshActor::New( CreateMesh() ); - - SetupBackgroundActorConstrained( meshActor, Actor::Property::SCALE, color ); - - // Set the background actor before adding so that we do not inform deriving classes - background.actor = meshActor; - Self().Add( meshActor ); + Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); } - - background.color = color; } -Vector4 Control::GetBackgroundColor() const +bool Control::HasKeyInputFocus() { - if ( mImpl->mBackground ) + bool result = false; + if( Self().OnStage() ) { - return mImpl->mBackground->color; + result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); } - return Color::TRANSPARENT; + return result; } -void Control::SetBackgroundImage( Image image ) +void Control::ClearKeyInputFocus() { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) + if( Self().OnStage() ) { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes - Self().Remove( background.actor ); - background.actor.Reset(); + Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); } +} - ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, background.color ); +void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) +{ + mImpl->mIsKeyboardFocusGroup = isFocusGroup; - // Set the background actor before adding so that we do not inform derived classes - background.actor = imageActor; - Self().Add( imageActor ); + // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted + Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup); } -void Control::ClearBackground() +bool Control::IsKeyboardFocusGroup() { - if ( mImpl->mBackground ) - { - Background& background( mImpl->GetBackground() ); - Self().Remove( background.actor ); - - delete mImpl->mBackground; - mImpl->mBackground = NULL; - } + return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self()); } -Actor Control::GetBackgroundActor() const +void Control::AccessibilityActivate() { - if ( mImpl->mBackground ) - { - return mImpl->mBackground->actor; - } - - return Actor(); + // Inform deriving classes + OnAccessibilityActivated(); } -void Control::SetKeyboardNavigationSupport(bool isSupported) +void Control::KeyboardEnter() { - mImpl->mIsKeyboardNavigationSupported = isSupported; + // Inform deriving classes + OnKeyboardEnter(); } -bool Control::IsKeyboardNavigationSupported() +bool Control::OnAccessibilityActivated() { - return mImpl->mIsKeyboardNavigationSupported; + return false; // Accessibility activation is not handled by default } -void Control::Activate() +bool Control::OnKeyboardEnter() { - // Inform deriving classes - OnActivated(); + return false; // Keyboard enter is not handled by default } bool Control::OnAccessibilityPan(PanGesture gesture) @@ -649,20 +671,12 @@ bool Control::OnAccessibilityValueChange(bool isIncrease) return false; // Accessibility value change action is not handled by default } -void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) +bool Control::OnAccessibilityZoom() { - mImpl->mIsKeyboardFocusGroup = isFocusGroup; - - // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted - Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup); + return false; // Accessibility zoom action is not handled by default } -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(); } @@ -671,75 +685,6 @@ void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) { } -bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) -{ - 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; -} - -bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) -{ - 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_KEY_INPUT_FOCUS_GAINED ) ) - { - controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) ) - { - controlImpl.KeyInputFocusLostSignal().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; -} - Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() { return mImpl->mKeyEventSignal; @@ -786,98 +731,45 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - // Calling deriving classes + // Call deriving classes so initialised before styling is applied to them. OnInitialize(); if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + // if stylemanager is available + if( styleManager ) + { + // Register for style changes + styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - - // SetTheme - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + // Apply the current style + GetImpl( styleManager ).ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + } } if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { SetKeyboardNavigationSupport( true ); } - - mImpl->mInitialized = true; } -void Control::EnableGestureDetection(Gesture::Type type) +void Control::OnInitialize() { - 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::OnInitialize() +void Control::OnControlChildAdd( Actor& child ) { } -void Control::OnActivated() +void Control::OnControlChildRemove( Actor& child ) { } -void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { // By default the control is only interested in theme (not font) changes - if( change.themeChange ) + if( styleManager && change == StyleChange::THEME_CHANGE ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } @@ -911,81 +803,88 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlStageConnection() -{ -} - -void Control::OnControlStageDisconnection() +void Control::EmitKeyInputFocusSignal( bool focusGained ) { -} + Dali::Toolkit::Control handle( GetOwner() ); -void Control::OnControlChildAdd( Actor& child ) -{ + 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::OnControlChildRemove( Actor& child ) +void Control::OnStageConnection( int depth ) { + if( mImpl->mBackgroundRenderer) + { + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOnStage( self ); + } } -void Control::OnControlSizeSet( const Vector3& size ) +void Control::OnStageDisconnection() { + if( mImpl->mBackgroundRenderer ) + { + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOffStage( self ); + } } -void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) +void Control::OnKeyInputFocusGained() { + EmitKeyInputFocusSignal( true ); } -void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) +void Control::OnKeyInputFocusLost() { + EmitKeyInputFocusSignal( false ); } -void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void Control::OnChildAdd(Actor& child) { - for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) + // If this is the background actor, then we do not want to inform deriving classes + if ( mImpl->mAddRemoveBackgroundChild ) { - container.Add( Self().GetChildAt( i ), size ); + return; } -} -void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) -{ + // Notify derived classes. + OnControlChildAdd( child ); } -void Control::EmitKeyInputFocusSignal( bool focusGained ) +void Control::OnChildRemove(Actor& child) { - Dali::Toolkit::Control handle( GetOwner() ); - - if ( focusGained ) + // If this is the background actor, then we do not want to inform deriving classes + if ( mImpl->mAddRemoveBackgroundChild ) { - // 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 ); - } + return; } -} -void Control::OnKeyInputFocusGained() -{ - EmitKeyInputFocusSignal( true ); + // Notify derived classes. + OnControlChildRemove( child ); } -void Control::OnKeyInputFocusLost() +void Control::OnSizeSet(const Vector3& targetSize) { - EmitKeyInputFocusSignal( false ); + // 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) @@ -1003,63 +902,60 @@ 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 } -void Control::OnStageConnection() +void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - // Notify derived classes. - OnControlStageConnection(); + for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) + { + container.Add( Self().GetChildAt( i ), size ); + } } -void Control::OnStageDisconnection() +void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { - // Notify derived classes - OnControlStageDisconnection(); } -void Control::OnChildAdd(Actor& child) +Vector3 Control::GetNaturalSize() { - // 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->mBackgroundRenderer ) { - return; + Vector2 naturalSize; + mImpl->mBackgroundRenderer.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } + return Vector3::ZERO; +} - // Notify derived classes. - OnControlChildAdd( child ); +float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) +{ + return CalculateChildSizeBase( child, dimension ); } -void Control::OnChildRemove(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 ) ) - { - return; - } + return GetHeightForWidthBase( width ); +} - // Notify derived classes. - OnControlChildRemove( child ); +float Control::GetWidthForHeight( float height ) +{ + return GetWidthForHeightBase( height ); } -void Control::OnSizeSet(const Vector3& targetSize) +bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) { - if( 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 ) @@ -1072,6 +968,22 @@ void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* call mImpl->SignalDisconnected( slotObserver, callback ); } +Control& GetImplementation( Dali::Toolkit::Control& handle ) +{ + 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 } // namespace Toolkit