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=3f58064a8cc00581430fe82139633ea450077219;hp=6c4b2117094f75b622761421d4d8b4f6a6a7c79d;hb=a3b69d118ee5f918a827b23ea76813a7aefad845;hpb=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 6c4b211..3f58064 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) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include // for strcmp #include #include +#include #include #include #include @@ -29,6 +30,8 @@ #include #include #include +#include +#include #include #include @@ -38,14 +41,20 @@ #include #include #include +#include +#include #include #include #include #include #include +#include +#include +#include namespace Dali { +extern bool CaseInsensitiveStringCompare( const std::string& a, const std::string& b ); namespace Toolkit { @@ -54,9 +63,14 @@ namespace { #if defined(DEBUG_ENABLED) -Debug::Filter* gLogFilter = Debug::Filter::New( Debug::General, false, "LOG_CONTROL_VISUALS"); +Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); #endif +DALI_ENUM_TO_STRING_TABLE_BEGIN( CLIPPING_MODE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, DISABLED ) +DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, CLIP_CHILDREN ) +DALI_ENUM_TO_STRING_TABLE_END( CLIPPING_MODE ) + /** * Struct used to store Visual within the control, index is a unique key for each visual. */ @@ -64,32 +78,14 @@ struct RegisteredVisual { Property::Index index; Toolkit::Visual::Base visual; - Actor placementActor; bool enabled; - RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor, bool aEnabled) : - index(aIndex), visual(aVisual), placementActor(aPlacementActor), enabled(aEnabled) {} -}; - -struct VisualProperty -{ - Handle handle; ///< a handle to the target object - Property::Index index; ///< The index of a property provided by the referenced object - - VisualProperty( ) - : handle(), - index( Property::INVALID_INDEX ) - { - } - - VisualProperty( Handle& handle, Property::Index index ) - : handle( handle ), - index( index ) + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled) + : index(aIndex), visual(aVisual), enabled(aEnabled) { } }; - typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer; /** @@ -107,71 +103,25 @@ bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals return false; } -VisualProperty GetVisualProperty( - Internal::Control& controlImpl, +Toolkit::Visual::Base GetVisualByName( RegisteredVisualContainer& visuals, - const std::string& visualName, - Property::Key propertyKey ) + const std::string& visualName ) { -#if defined(DEBUG_ENABLED) - std::ostringstream oss; - oss << "Control::GetVisualProperty(" << visualName << ", " << propertyKey << ")" << std::endl; - DALI_LOG_INFO( gLogFilter, Debug::General, oss.str().c_str() ); -#endif + Toolkit::Visual::Base visualHandle; - // Find visualName in the control RegisteredVisualContainer::Iterator iter; for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) { - if ( (*iter)->visual.GetName() == visualName ) + Toolkit::Visual::Base visual = (*iter)->visual; + if( visual && visual.GetName() == visualName ) { + visualHandle = visual; break; } } - - // Does either it's renderer or placement actor have an associated property? - if( iter != visuals.End() ) - { - Actor placementActor = (*iter)->placementActor; - if( !placementActor ) - { - placementActor = controlImpl.Self(); - } - - Property::Index index = placementActor.GetPropertyIndex( propertyKey ); - if( index != Property::INVALID_INDEX ) - { - // It's a placement actor property: - return VisualProperty( placementActor, index ); - } - else - { - // Check if it is a renderer property: - if( placementActor.GetRendererCount() > 0 ) - { - // @todo Need to use correct renderer index when placement actors - // are removed - Renderer renderer = placementActor.GetRendererAt(0); - Property::Index index = renderer.GetPropertyIndex( propertyKey ); - if( index != Property::INVALID_INDEX ) - { - // It's a renderer property: - return VisualProperty( renderer, index ); - } - } - else - { - std::ostringstream oss; - oss << propertyKey; - DALI_LOG_WARNING( "Control::GetVisualProperty(%s, %s) No renderers\n", visualName.c_str(), oss.str().c_str() ); - } - } - } - Handle handle; - return VisualProperty( handle, Property::INVALID_INDEX ); + return visualHandle; } - /** * Creates control through type registry */ @@ -268,6 +218,12 @@ static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra return connected; } +const Scripting::StringEnum ControlStateTable[] = { + { "NORMAL", Toolkit::DevelControl::NORMAL }, + { "FOCUSED", Toolkit::DevelControl::FOCUSED }, + { "DISABLED", Toolkit::DevelControl::DISABLED }, +}; const unsigned int ControlStateTableCount = sizeof( ControlStateTable ) / sizeof( ControlStateTable[0] ); + // Setup signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); @@ -297,8 +253,9 @@ public: // Construction & Destruction Impl(Control& controlImpl) : mControlImpl( controlImpl ), + mState( Toolkit::DevelControl::NORMAL ), + mSubState(""), mStyleName(""), - mBackgroundVisual(), mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), @@ -364,6 +321,27 @@ public: break; } + case Toolkit::DevelControl::Property::STATE: + { + Toolkit::DevelControl::State state( controlImpl.mImpl->mState ); + + if( Scripting::GetEnumerationProperty< Toolkit::DevelControl::State >( value, ControlStateTable, ControlStateTableCount, state ) ) + { + controlImpl.mImpl->SetState( state ); + } + } + break; + + case Toolkit::DevelControl::Property::SUB_STATE: + { + std::string subState; + if( value.Get( subState ) ) + { + controlImpl.mImpl->SetSubState( subState ); + } + } + break; + case Toolkit::Control::Property::BACKGROUND_COLOR: { DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); @@ -381,7 +359,7 @@ public: } else { - // An empty map means the background is no longer required + // An empty image means the background is no longer required controlImpl.ClearBackground(); } break; @@ -402,18 +380,39 @@ public: case Toolkit::Control::Property::BACKGROUND: { + std::string url; const Property::Map* map = value.GetMap(); - if( map ) + 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 not a property map, so we should clear the background + // The background is an empty property map, so we should clear the background controlImpl.ClearBackground(); } break; } + + case Toolkit::DevelControl::Property::TOOLTIP: + { + TooltipPtr& tooltipPtr = controlImpl.mImpl->mTooltip; + if( ! tooltipPtr ) + { + tooltipPtr = Tooltip::New( control ); + } + tooltipPtr->SetProperties( value ); + } } } } @@ -442,6 +441,12 @@ public: break; } + case Toolkit::DevelControl::Property::STATE: + { + value = Scripting::GetEnumerationName< Toolkit::DevelControl::State >( controlImpl.mImpl->mState, ControlStateTable, ControlStateTableCount ); + break; + } + case Toolkit::Control::Property::BACKGROUND_COLOR: { DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); @@ -453,9 +458,10 @@ public: { DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Property::Map map; - if( controlImpl.mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { - controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map ); + visual.CreatePropertyMap( map ); } value = map; break; @@ -470,27 +476,79 @@ public: case Toolkit::Control::Property::BACKGROUND: { Property::Map map; - if( controlImpl.mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = controlImpl.GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { - (controlImpl.mImpl->mBackgroundVisual).CreatePropertyMap( map ); + visual.CreatePropertyMap( map ); } value = map; break; } + case Toolkit::DevelControl::Property::TOOLTIP: + { + Property::Map map; + if( controlImpl.mImpl->mTooltip ) + { + controlImpl.mImpl->mTooltip->CreatePropertyMap( map ); + } + value = map; + break; + } + } } return value; } + void SetState( DevelControl::State state ) + { + if( mState != state ) + { + // If mState was Disabled, and new state is Focused, should probably + // store that fact, e.g. in another property that FocusManager can access. + mState = state; + + // Trigger state change and transitions + // Apply new style, if stylemanager is available + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + if( styleManager ) + { + const StylePtr stylePtr = GetImpl( styleManager ).GetRecordedStyle( Toolkit::Control( mControlImpl.GetOwner() ) ); + if( stylePtr ) + { + for( int i=mVisuals.Count()-1; i >= 0; i-- ) + { + mControlImpl.UnregisterVisual( mVisuals[i]->index ); + } + + Dali::CustomActor handle( mControlImpl.GetOwner() ); + stylePtr->ApplyVisualsAndPropertiesRecursively( handle ); + } + } + } + } + + void SetSubState( const std::string& state ) + { + if( mSubState != state ) + { + mSubState = state; + // Trigger transitions + + } + } + // Data Control& mControlImpl; + DevelControl::State mState; + std::string mSubState; + RegisteredVisualContainer mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used. std::string mStyleName; - Toolkit::Visual::Base mBackgroundVisual; ///< The visual to render the background 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; @@ -503,16 +561,22 @@ public: TapGestureDetector mTapGestureDetector; LongPressGestureDetector mLongPressGestureDetector; + // Tooltip + TooltipPtr mTooltip; + 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. + // Properties - these need to be members of Internal::Control::Impl as they access private methods/data of Internal::Control and Internal::Control::Impl. 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; + static const PropertyRegistration PROPERTY_6; + static const PropertyRegistration PROPERTY_7; + static const PropertyRegistration PROPERTY_8; }; // Properties registered without macro to use specific member variables. @@ -521,6 +585,9 @@ const PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "backgro 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 ); +const PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "tooltip", Toolkit::DevelControl::Property::TOOLTIP, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "state", Toolkit::DevelControl::Property::STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_8( typeRegistration, "subState", Toolkit::DevelControl::Property::SUB_STATE, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); Toolkit::Control Control::New() { @@ -537,11 +604,6 @@ Toolkit::Control Control::New() return handle; } -Control::~Control() -{ - delete mImpl; -} - void Control::SetStyleName( const std::string& styleName ) { if( styleName != mImpl->mStyleName ) @@ -564,17 +626,12 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - Actor self( Self() ); mImpl->mBackgroundColor = color; Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::DevelVisual::Property::TYPE ] = Toolkit::Visual::COLOR; map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; - mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); - if( mImpl->mBackgroundVisual ) - { - mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); - } + + SetBackground( map ); } Vector4 Control::GetBackgroundColor() const @@ -584,31 +641,34 @@ Vector4 Control::GetBackgroundColor() const void Control::SetBackground( const Property::Map& map ) { - Actor self( Self() ); - mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); - if( mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map ); + if( visual ) { - mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + 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(); } } void Control::SetBackgroundImage( Image image ) { - Actor self( Self() ); - mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); - RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); - if( mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if( visual ) { - mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); + visual.SetDepthIndex( DepthIndex::BACKGROUND ); } } void Control::ClearBackground() { - Actor self( Self() ); - mImpl->mBackgroundVisual.RemoveAndReset( self ); - mImpl->mBackgroundColor = Color::TRANSPARENT; + UnregisterVisual( Toolkit::Control::Property::BACKGROUND ); + mImpl->mBackgroundColor = Color::TRANSPARENT; + + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); } void Control::EnableGestureDetection(Gesture::Type type) @@ -750,54 +810,63 @@ void Control::KeyboardEnter() OnKeyboardEnter(); } -void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual ) +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) { - RegisterVisual( index, placementActor, visual, true ); + RegisterVisual( index, visual, true ); } -void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual, bool enabled ) +void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) { bool visualReplaced ( false ); - Actor actorToRegister; // Null actor, replaced if placement actor not Self Actor self = Self(); - if ( placementActor != self ) // Prevent increasing ref count if actor self + if( !mImpl->mVisuals.Empty() ) { - actorToRegister = placementActor; + 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 ( !mImpl->mVisuals.Empty() ) + // If not set, set the name of the visual to the same name as the control's property. + // ( If the control has been type registered ) + if( visual.GetName().empty() ) { - RegisteredVisualContainer::Iterator iter; - // Check if visual (index) is already registered. Replace if so. - if ( FindVisual( index, mImpl->mVisuals, iter ) ) + // Check if the control has been type registered: + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(*this) ); + if( typeInfo ) + { + // Check if the property index has been registered: + Property::IndexContainer indices; + typeInfo.GetPropertyIndices( indices ); + Property::IndexContainer::Iterator iter = std::find( indices.Begin(), indices.End(), index ); + if( iter != indices.End() ) { - if( (*iter)->visual && self.OnStage() ) - { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOffStage( (*iter)->placementActor ); - } - else - { - (*iter)->visual.SetOffStage( self ); - } - } - (*iter)->visual = visual; - (*iter)->placementActor = actorToRegister; - visualReplaced = true; + // If it has, then get it's name and use that for the visual + std::string visualName = typeInfo.GetPropertyName( index ); + visual.SetName( visualName ); } + } } - if ( !visualReplaced ) // New registration entry + if( !visualReplaced ) // New registration entry { - mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, actorToRegister, enabled ) ); + mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, enabled ) ); } if( visual && self.OnStage() && enabled ) { - visual.SetOnStage( placementActor ); + Toolkit::GetImplementation(visual).SetOnStage( self ); } + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled?"T":"F" ); } void Control::UnregisterVisual( Property::Index index ) @@ -805,6 +874,9 @@ void Control::UnregisterVisual( Property::Index index ) 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 ); } } @@ -827,26 +899,23 @@ void Control::EnableVisual( Property::Index index, bool enable ) { if ( (*iter)->enabled == enable ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable?"enabled":"disabled"); return; } (*iter)->enabled = enable; Actor parentActor = Self(); - if ( (*iter)->placementActor ) - { - parentActor = (*iter)->placementActor; - } - if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. { if ( enable ) { - - (*iter)->visual.SetOnStage( parentActor ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) on stage \n", (*iter)->visual.GetName().c_str(), index ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor ); } else { - (*iter)->visual.SetOffStage( parentActor ); // No need to call if control not staged. + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) off stage \n", (*iter)->visual.GetName().c_str(), index ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. } } } @@ -862,24 +931,6 @@ bool Control::IsVisualEnabled( Property::Index index ) const return false; } -Actor Control::GetPlacementActor( Property::Index index ) const -{ - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - if( (*iter)->placementActor ) - { - return (*iter)->placementActor; - } - else - { - return Self(); - } - } - - return Actor(); -} - Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle ) { Dali::Animation transition; @@ -893,51 +944,49 @@ Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle iter != end; ++iter ) { TransitionData::Animator* animator = (*iter); - VisualProperty visualProperty; - // Attempt to find the object name as a child actor - Actor child = Self().FindChildByName( animator->objectName ); - if( child ) + Toolkit::Visual::Base visual = GetVisualByName( mImpl->mVisuals, animator->objectName ); + + if( visual ) { - Property::Index propertyIndex = child.GetPropertyIndex( animator->propertyKey ); - visualProperty = VisualProperty( child, propertyIndex ); + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.AnimateProperty( transition, *animator ); } else { - // Is it a placement actor/visual pair?; - visualProperty = GetVisualProperty( *this, mImpl->mVisuals, - animator->objectName, - animator->propertyKey ); - } - - if( visualProperty.handle && visualProperty.index != Property::INVALID_INDEX ) - { - if( animator->animate == false ) - { - if( animator->targetValue.GetType() != Property::NONE ) - { - visualProperty.handle.SetProperty( visualProperty.index, animator->targetValue ); - } - } - else + // Otherwise, try any actor children of control (Including the control) + Actor child = Self().FindChildByName( animator->objectName ); + if( child ) { - if( animator->initialValue.GetType() != Property::NONE ) + Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey ); + if( propertyIndex != Property::INVALID_INDEX ) { - visualProperty.handle.SetProperty( visualProperty.index, animator->initialValue ); + if( animator->animate == false ) + { + if( animator->targetValue.GetType() != Property::NONE ) + { + child.SetProperty( propertyIndex, animator->targetValue ); + } + } + else // animate the property + { + if( animator->initialValue.GetType() != Property::NONE ) + { + child.SetProperty( propertyIndex, animator->initialValue ); + } + + if( ! transition ) + { + transition = Dali::Animation::New( 0.1f ); + } + + transition.AnimateTo( Property( child, propertyIndex ), + animator->targetValue, + animator->alphaFunction, + TimePeriod( animator->timePeriodDelay, + animator->timePeriodDuration ) ); + } } - - 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( visualProperty.handle, visualProperty.index ), - animator->targetValue, - animator->alphaFunction, - TimePeriod( animator->timePeriodDelay, - animator->timePeriodDuration ) ); } } } @@ -946,7 +995,6 @@ Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle return transition; } - bool Control::OnAccessibilityActivated() { return false; // Accessibility activation is not handled by default @@ -1030,6 +1078,11 @@ Control::Control( ControlBehaviour behaviourFlags ) mImpl->mFlags = behaviourFlags; } +Control::~Control() +{ + delete mImpl; +} + void Control::Initialize() { // Call deriving classes so initialised before styling is applied to them. @@ -1133,19 +1186,32 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size() ); + + Actor self( Self() ); + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + // Check whether the visual is empty and enabled if( (*iter)->visual && (*iter)->enabled ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOnStage( (*iter)->placementActor ); - } - else + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection Setting visual(%d) on stage\n", (*iter)->index ); + Toolkit::GetImplementation((*iter)->visual).SetOnStage( self ); + } + } + + if( mImpl->mVisuals.Empty() && ! self.GetRendererCount() ) + { + Property::Value clippingValue = self.GetProperty( Actor::Property::CLIPPING_MODE ); + int clippingMode = ClippingMode::DISABLED; + if( clippingValue.Get( clippingMode ) ) + { + // Add a transparent background if we do not have any renderers or visuals so we clip our children + + if( clippingMode == ClippingMode::CLIP_CHILDREN ) { - Actor self( Self() ); - (*iter)->visual.SetOnStage( self ); + // Create a transparent background visual which will also get staged. + SetBackgroundColor( Color::TRANSPARENT ); } } } @@ -1155,18 +1221,12 @@ void Control::OnStageDisconnection() { for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + // Check whether the visual is empty if( (*iter)->visual ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOffStage( (*iter)->placementActor ); - } - else - { - Actor self( Self() ); - (*iter)->visual.SetOffStage( self ); - } + 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 ); } } } @@ -1193,12 +1253,36 @@ void Control::OnChildRemove(Actor& child) OnControlChildRemove( child ); } +void Control::OnPropertySet( Property::Index index, Property::Value propertyValue ) +{ + Actor self( Self() ); + if( index == Actor::Property::CLIPPING_MODE ) + { + // Only set the background if we're already on the stage and have no renderers or visuals + + if( mImpl->mVisuals.Empty() && ! self.GetRendererCount() && self.OnStage() ) + { + ClippingMode::Type clippingMode = ClippingMode::DISABLED; + if( Scripting::GetEnumerationProperty< ClippingMode::Type >( propertyValue, CLIPPING_MODE_TABLE, CLIPPING_MODE_TABLE_COUNT, clippingMode ) ) + { + // Add a transparent background if we do not have one so we clip children + + if( clippingMode == ClippingMode::CLIP_CHILDREN ) + { + SetBackgroundColor( Color::TRANSPARENT ); + } + } + } + } +} + void Control::OnSizeSet(const Vector3& targetSize) { - if( mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { Vector2 size( targetSize ); - mImpl->mBackgroundVisual.SetSize( size ); + visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform } } @@ -1233,6 +1317,12 @@ void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) { container.Add( Self().GetChildAt( i ), size ); } + + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) + { + visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform + } } void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) @@ -1241,11 +1331,12 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - if( mImpl->mBackgroundVisual ) + Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); + if( visual ) { Vector2 naturalSize; - mImpl->mBackgroundVisual.GetNaturalSize(naturalSize); - return Vector3(naturalSize); + visual.GetNaturalSize( naturalSize ); + return Vector3( naturalSize ); } return Vector3::ZERO; }