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=a00927381a41b36b7082401cfd0df01b0e7f55e4;hp=16b4e6738493aaa88c80ffa9845f6755444aedc8;hb=c6eb78824e08f7a863c55b3599d37b641c0313ba;hpb=b46395d404c2b437c4679975e0ed2c073949ba61 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 16b4e67..b71a080 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) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,23 +22,30 @@ #include // for strcmp #include #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 +#include +#include +#include namespace Dali { @@ -50,104 +57,240 @@ namespace { #if defined(DEBUG_ENABLED) -Integration::Log::Filter* gLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_CONTROL"); +Debug::Filter* gLogFilter = Debug::Filter::New( Debug::General, false, "LOG_CONTROL_VISUALS"); #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 ); - -BaseHandle Create() +/** + * Struct used to store Visual within the control, index is a unique key for each visual. + */ +struct RegisteredVisual { - return Internal::Control::New(); -} + Property::Index index; + Toolkit::Visual::Base visual; + bool enabled; -// Setup signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled) : + index(aIndex), visual(aVisual), enabled(aEnabled) {} +}; -// Note: Properties are registered separately below, +struct HandleIndex +{ + Handle handle; ///< a handle to the target object + Property::Index index; ///< The index of a property provided by the referenced object -DALI_SIGNAL_REGISTRATION( Control, "key-event", SIGNAL_KEY_EVENT ) -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 ) + HandleIndex( ) + : handle(), + index( Property::INVALID_INDEX ) + { + } -DALI_ACTION_REGISTRATION( Control, "control-activated", ACTION_CONTROL_ACTIVATED ) + HandleIndex( Handle& handle, Property::Index index ) + : handle( handle ), + index( index ) + { + } +}; -DALI_TYPE_REGISTRATION_END() + +typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer; /** - * Structure which holds information about the background of a control + * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter */ -struct Background +bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter ) { - Actor actor; ///< Either a MeshActor or an ImageActor - Vector4 color; ///< The color of the actor. + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + { + if ( (*iter)->index == targetIndex ) + { + return true; + } + } + return false; +} - /** - * Constructor - */ - Background() - : actor(), - color( Color::WHITE ) +HandleIndex GetVisualProperty( + Internal::Control& controlImpl, + RegisteredVisualContainer& visuals, + const std::string& visualName, + Property::Key propertyKey ) +{ +#if defined(DEBUG_ENABLED) + std::ostringstream oss; + oss << "Control::GetHandleIndex(" << visualName << ", " << propertyKey << ")" << std::endl; + DALI_LOG_INFO( gLogFilter, Debug::General, oss.str().c_str() ); +#endif + + // Find visualName in the control + RegisteredVisualContainer::Iterator iter; + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) { + if ( (*iter)->visual.GetName() == visualName ) + { + break; + } } -}; + + // Does it's renderer have an associated property? + if( iter != visuals.End() ) + { + Actor self = controlImpl.Self(); + Property::Index index = DevelHandle::GetPropertyIndex( self, propertyKey ); + if( index != Property::INVALID_INDEX ) + { + // It's an actor property: + return HandleIndex( self, index ); + } + else + { + // Check if it is a renderer property: + if( self.GetRendererCount() > 0 ) + { + // @todo Need to use correct renderer index + Renderer renderer = self.GetRendererAt(0); + Property::Index index = DevelHandle::GetPropertyIndex( renderer, propertyKey ); + if( index != Property::INVALID_INDEX ) + { + // It's a renderer property: + return HandleIndex( renderer, index ); + } + } + else + { + std::ostringstream oss; + oss << propertyKey; + DALI_LOG_WARNING( "Control::GetHandleIndex(%s, %s) No renderers\n", visualName.c_str(), oss.str().c_str() ); + } + } + } + Handle handle; + return HandleIndex( handle, Property::INVALID_INDEX ); +} + +void SetDefaultTransform( Property::Map& propertyMap ) +{ + propertyMap.Clear(); + propertyMap + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); +} /** - * Creates a white coloured Mesh. + * Creates control through type registry */ -Mesh CreateMesh() +BaseHandle Create() { - Vector3 white( Color::WHITE ); - - MeshData meshData; - - // 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 ); + return Internal::Control::New(); +} - // 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 ); +/** + * 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 + */ +const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated"; +static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) +{ + bool ret = false; - // Create the mesh data from the vertices and faces - meshData.SetMaterial( Material::New( "ControlMaterial" ) ); - meshData.SetVertices( vertices ); - meshData.SetFaceIndices( faces ); - meshData.SetHasColor( true ); + 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 Mesh::New( meshData ); + return ret; } /** - * 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. + * 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. */ -void SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const Vector4& color ) +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 ) { - 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.SetRelayoutEnabled( false ); + Dali::BaseHandle handle( object ); + + bool connected( false ); + Toolkit::Control control = Toolkit::Control::DownCast( handle ); + if ( control ) + { + Internal::Control& controlImpl( Internal::GetImplementation( control ) ); + connected = true; - Constraint constraint = Constraint::New( actor, - constrainingIndex, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); + 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; } +// 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_ACCESSIBILITY_ACTIVATED, &DoAction ); + +DALI_TYPE_REGISTRATION_END() + } // unnamed namespace namespace Internal @@ -157,40 +300,26 @@ 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 ), + mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), mPinchGestureDetector(), mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), - mFlags( Control::CONTROL_BEHAVIOUR_NONE ), + mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mInitialized( false ) + mIsKeyboardFocusGroup( false ) { } ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -216,21 +345,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 /** @@ -245,7 +359,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -257,25 +371,22 @@ 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 + // An empty image means the background is no longer required controlImpl.ClearBackground(); } break; @@ -293,6 +404,32 @@ public: } break; } + + case Toolkit::Control::Property::BACKGROUND: + { + std::string url; + const Property::Map* map = value.GetMap(); + if( map && !map->Empty() ) + { + controlImpl.SetBackground( *map ); + } + else if( value.Get( url ) ) + { + // don't know the size to load + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( url, ImageDimensions() ); + if( visual ) + { + controlImpl.RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); + visual.SetDepthIndex( DepthIndex::BACKGROUND ); + } + } + else + { + // The background is an empty property map, so we should clear the background + controlImpl.ClearBackground(); + } + break; + } } } } @@ -311,7 +448,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -323,27 +460,20 @@ 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 ) + Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { - ImageActor imageActor = ImageActor::DownCast( actor ); - if ( imageActor ) - { - Image image = imageActor.GetImage(); - Property::Map imageMap; - Scripting::CreatePropertyMap( image, imageMap ); - map[ "image" ] = imageMap; - } + visual.CreatePropertyMap( map ); } - value = map; break; } @@ -353,6 +483,20 @@ public: value = controlImpl.HasKeyInputFocus(); break; } + + case Toolkit::Control::Property::BACKGROUND: + { + Property::Map map; + Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) + { + visual.CreatePropertyMap( map ); + } + + value = map; + break; + } + } } @@ -362,42 +506,43 @@ public: // Data Control& mControlImpl; + RegisteredVisualContainer mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used. std::string mStyleName; - Background* mBackground; ///< Only create the background if we use it + Vector4 mBackgroundColor; ///< The color of the background visual 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. - ControlBehaviour mFlags :6; ///< Flags passed in from constructor. Need to increase this size when new enums are added + 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; // 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() { // Create the implementation, temporarily owned on stack - IntrusivePtr controlImpl = new Control( CONTROL_BEHAVIOUR_NONE ); + IntrusivePtr controlImpl = new Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ); // Pass ownership to handle Toolkit::Control handle( *controlImpl ); @@ -409,83 +554,129 @@ Toolkit::Control Control::New() return handle; } -Control::~Control() +void Control::SetStyleName( const std::string& styleName ) { - delete mImpl; + 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() ) ); + } + } } -Vector3 Control::GetNaturalSize() +const std::string& Control::GetStyleName() const { - // could be overridden in derived classes. - return mImpl->mNaturalSize; + return mImpl->mStyleName; } -float Control::CalculateChildSize( const Dali::Actor& child, Dimension dimension ) +void Control::SetBackgroundColor( const Vector4& color ) { - // Could be overridden in derived classes. - return CalculateChildSizeBase( child, dimension ); + mImpl->mBackgroundColor = color; + Property::Map map; + map[ Toolkit::DevelVisual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; + + SetBackground( map ); } -bool Control::RelayoutDependentOnChildren( Dimension dimension ) +Vector4 Control::GetBackgroundColor() const { - return RelayoutDependentOnChildrenBase( dimension ); + return mImpl->mBackgroundColor; } -float Control::GetHeightForWidth( float width ) +void Control::SetBackground( const Property::Map& map ) { - // could be overridden in derived classes. - float height( 0.0f ); - if ( mImpl->mNaturalSize.width > 0.0f ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map ); + if( visual ) { - height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width; + RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); + visual.SetDepthIndex( DepthIndex::BACKGROUND ); + + // Trigger a size negotiation request that may be needed by the new visual to relayout its contents. + RelayoutRequest(); } - return height; } -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 ) + DALI_LOG_WARNING( "SetBackgroundImage is for the depreciated Property::BACKGROUND_IMAGE use SetBackground( const Property::Map& map )\n" ); + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if( visual ) { - width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height; + RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); + visual.SetDepthIndex( DepthIndex::BACKGROUND ); } - return width; } -const Vector3& Control::GetControlSize() const +void Control::ClearBackground() { - return mImpl->mCurrentSize; -} + UnregisterVisual( Toolkit::Control::Property::BACKGROUND ); + mImpl->mBackgroundColor = Color::TRANSPARENT; -const Vector3& Control::GetSizeSet() const -{ - return mImpl->mNaturalSize; + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); } -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(); } } @@ -509,111 +700,238 @@ 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( Self().OnStage() ) + { + Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); + } +} - if ( background.actor ) +bool Control::HasKeyInputFocus() +{ + bool result = false; + if( Self().OnStage() ) { - // Just set the actor color - background.actor.SetColor( color ); + result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); } - else + return result; +} + +void Control::ClearKeyInputFocus() +{ + if( Self().OnStage() ) { - // Create Mesh Actor - MeshActor meshActor = MeshActor::New( CreateMesh() ); + Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); + } +} - SetupBackgroundActor( meshActor, Actor::Property::SCALE, color ); +void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) +{ + mImpl->mIsKeyboardFocusGroup = isFocusGroup; - // Set the background actor before adding so that we do not inform deriving classes - background.actor = meshActor; - Self().Add( meshActor ); - } + // 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()); +} + +void Control::AccessibilityActivate() +{ + // Inform deriving classes + OnAccessibilityActivated(); +} - background.color = color; +void Control::KeyboardEnter() +{ + // Inform deriving classes + OnKeyboardEnter(); } -Vector4 Control::GetBackgroundColor() const +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) { - if ( mImpl->mBackground ) + RegisterVisual( index, visual, true ); +} + +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) +{ + bool visualReplaced ( false ); + Actor self = Self(); + + if( !mImpl->mVisuals.Empty() ) + { + RegisteredVisualContainer::Iterator iter; + // Check if visual (index) is already registered. Replace if so. + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if( (*iter)->visual && self.OnStage() ) + { + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); + } + (*iter)->visual = visual; + visualReplaced = true; + } + } + + if( !visualReplaced ) // New registration entry { - return mImpl->mBackground->color; + mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, enabled ) ); + } + + if( visual && self.OnStage() && enabled ) + { + Toolkit::GetImplementation(visual).SetOnStage( self ); } - return Color::TRANSPARENT; } -void Control::SetBackgroundImage( Image image ) +void Control::UnregisterVisual( Property::Index index ) { - Background& background( mImpl->GetBackground() ); + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); + (*iter)->visual.Reset(); + mImpl->mVisuals.Erase( iter ); + } +} - if ( background.actor ) +Toolkit::Visual::Base Control::GetVisual( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes - Self().Remove( background.actor ); - background.actor.Reset(); + return (*iter)->visual; } - ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, Actor::Property::SIZE, background.color ); - - // Set the background actor before adding so that we do not inform derived classes - background.actor = imageActor; - Self().Add( imageActor ); + return Toolkit::Visual::Base(); } -void Control::ClearBackground() +void Control::EnableVisual( Property::Index index, bool enable ) { - if ( mImpl->mBackground ) + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) { - Background& background( mImpl->GetBackground() ); - Self().Remove( background.actor ); + if ( (*iter)->enabled == enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual Already enabled set (%s) \n", enable?"enabled":"disabled"); + return; + } - delete mImpl->mBackground; - mImpl->mBackground = NULL; + (*iter)->enabled = enable; + Actor parentActor = Self(); + if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. + { + if ( enable ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting Visual(%d) on stage \n", index ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor ); + } + else + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting Visual(%d) off stage \n", index ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. + } + } } } -Actor Control::GetBackgroundActor() const +bool Control::IsVisualEnabled( Property::Index index ) const { - if ( mImpl->mBackground ) + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) { - return mImpl->mBackground->actor; + return (*iter)->enabled; } - - return Actor(); + return false; } -void Control::SetKeyboardNavigationSupport(bool isSupported) +Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle ) { - mImpl->mIsKeyboardNavigationSupported = isSupported; + Dali::Animation transition; + const Internal::TransitionData& transitionData = Toolkit::GetImplementation( handle ); + + if( transitionData.Count() > 0 ) + { + // Setup a Transition from TransitionData. + TransitionData::Iterator end = transitionData.End(); + for( TransitionData::Iterator iter = transitionData.Begin() ; + iter != end; ++iter ) + { + TransitionData::Animator* animator = (*iter); + HandleIndex handleIndex; + + // Attempt to find the object name as a child actor + Actor child = Self().FindChildByName( animator->objectName ); + if( child ) + { + Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey ); + handleIndex = HandleIndex( child, propertyIndex ); + } + else + { + handleIndex = GetVisualProperty( *this, mImpl->mVisuals, + animator->objectName, + animator->propertyKey ); + } + + if( handleIndex.handle && handleIndex.index != Property::INVALID_INDEX ) + { + if( animator->animate == false ) + { + if( animator->targetValue.GetType() != Property::NONE ) + { + handleIndex.handle.SetProperty( handleIndex.index, animator->targetValue ); + } + } + else + { + if( animator->initialValue.GetType() != Property::NONE ) + { + handleIndex.handle.SetProperty( handleIndex.index, animator->initialValue ); + } + + if( ! transition ) + { + // Create an animation with a default .1 second duration - the animators + // will automatically force it to the 'right' duration. + transition = Dali::Animation::New( 0.1f ); + } + + transition.AnimateTo( Property( handleIndex.handle, handleIndex.index ), + animator->targetValue, + animator->alphaFunction, + TimePeriod( animator->timePeriodDelay, + animator->timePeriodDuration ) ); + } + } + } + } + + return transition; } -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) @@ -631,20 +949,12 @@ bool Control::OnAccessibilityValueChange(bool isIncrease) return false; // Accessibility value change action is not handled by default } -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() +bool Control::OnAccessibilityZoom() { - return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self()); + return false; // Accessibility zoom action is not handled by default } -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(); } @@ -653,70 +963,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 ) @@ -742,114 +1001,66 @@ 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; } +Control::~Control() +{ + delete mImpl; +} + void Control::Initialize() { - // Calling deriving classes + // Call deriving classes so initialised before styling is applied to them. OnInitialize(); - // Test if the no size negotiation flag is not set - if( ( mImpl->mFlags & NO_SIZE_NEGOTIATION ) == 0 ) - { - // Size negotiate disabled by default, so turn it on for this actor - Self().SetRelayoutEnabled( true ); - } - - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) + if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) || + !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) ) { - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - - // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - - // SetTheme - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); - } + Toolkit::StyleManager styleManager = StyleManager::Get(); - 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 stylemanager is available + if( styleManager ) + { + StyleManager& styleManagerImpl = GetImpl( styleManager ); - if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) - { - mImpl->mPanGestureDetector = PanGestureDetector::New(); - mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); - mImpl->mPanGestureDetector.Attach(Self()); - } + // Register for style changes + styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange ); - if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) - { - mImpl->mTapGestureDetector = TapGestureDetector::New(); - mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); - mImpl->mTapGestureDetector.Attach(Self()); + // Apply the current style + styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + } } - if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) + if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { - mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); - mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); - mImpl->mLongPressGestureDetector.Attach(Self()); + SetKeyboardNavigationSupport( true ); } } -void Control::DisableGestureDetection(Gesture::Type type) +void Control::OnInitialize() { - 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() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) @@ -880,59 +1091,95 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlStageConnection() +void Control::EmitKeyInputFocusSignal( bool focusGained ) { -} - -void Control::OnControlStageDisconnection() -{ -} + 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 ) { -} + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size() ); -void Control::OnControlSizeSet( const Vector3& size ) -{ + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) + { + // Check whether the visual is empty and enabled + if( (*iter)->visual && (*iter)->enabled ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection Setting visual(%d) on stage\n", (*iter)->index ); + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( self ); + } + } } -void Control::OnCalculateRelayoutSize( Dimension dimension ) +void Control::OnStageDisconnection() { + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) + { + // Check whether the visual is empty + if( (*iter)->visual ) + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageDisconnection Setting visual(%d) off stage\n", (*iter)->index ); + Actor self( Self() ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); + } + } } -void Control::OnLayoutNegotiated( float size, Dimension dimension ) +void Control::OnKeyInputFocusGained() { + EmitKeyInputFocusSignal( true ); } -void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void Control::OnKeyInputFocusLost() { - for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) - { - container.Add( Self().GetChildAt( i ), size ); - } + EmitKeyInputFocusSignal( false ); } -void Control::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) +void Control::OnChildAdd(Actor& child) { + // Notify derived classes. + OnControlChildAdd( child ); } -void Control::OnKeyInputFocusGained() +void Control::OnChildRemove(Actor& child) { - // Do Nothing + // Notify derived classes. + OnControlChildRemove( child ); } -void Control::OnKeyInputFocusLost() +void Control::OnSizeSet(const Vector3& targetSize) { - // Do Nothing + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) + { + Vector2 size( targetSize ); + Property::Map transformMap; + SetDefaultTransform( transformMap ); + visual.SetTransformAndSize( transformMap, size ); + } } 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) @@ -950,63 +1197,70 @@ 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 ); + } + + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) + { + Vector2 controlSize( size ); + Property::Map transformMap; + SetDefaultTransform( transformMap ); + visual.SetTransformAndSize( transformMap, controlSize ); + } } -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 ) ) + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { - return; + Vector2 naturalSize; + visual.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 ) @@ -1019,6 +1273,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