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=02bbf97529386cb232cc84f87a7c1cef36b48072;hp=53c9293f4cb9b6d533957b6a7e267e8a9347f290;hb=22153f233e289227ae2c70d75a0fcbd04fb10082;hpb=3eb60a0aef6b188727b79bdee2e35c575c432a90 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 53c9293..02bbf97 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -38,10 +38,13 @@ #include #include #include +#include #include #include #include #include +#include +#include namespace Dali { @@ -52,6 +55,10 @@ namespace Toolkit namespace { +#if defined(DEBUG_ENABLED) +Debug::Filter* gLogFilter = Debug::Filter::New( Debug::General, false, "LOG_CONTROL_VISUALS"); +#endif + /** * Struct used to store Visual within the control, index is a unique key for each visual. */ @@ -59,17 +66,37 @@ struct RegisteredVisual { Property::Index index; Toolkit::Visual::Base visual; - Actor placementActor; + bool enabled; - RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor) : index(aIndex), visual(aVisual), placementActor(aPlacementActor) {} + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled) : + index(aIndex), visual(aVisual), enabled(aEnabled) {} }; -typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisuals; +struct HandleIndex +{ + Handle handle; ///< a handle to the target object + Property::Index index; ///< The index of a property provided by the referenced object + + HandleIndex( ) + : handle(), + index( Property::INVALID_INDEX ) + { + } + + HandleIndex( Handle& handle, Property::Index index ) + : handle( handle ), + index( index ) + { + } +}; + + +typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer; /** * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter */ -bool FindVisual( Property::Index targetIndex, RegisteredVisuals& visuals, RegisteredVisuals::Iterator& iter ) +bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter ) { for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) { @@ -81,6 +108,75 @@ bool FindVisual( Property::Index targetIndex, RegisteredVisuals& visuals, Regist return false; } +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 = self.GetPropertyIndex( 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 = renderer.GetPropertyIndex( 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 control through type registry */ @@ -205,21 +301,20 @@ public: // Construction & Destruction Impl(Control& controlImpl) -: mControlImpl( controlImpl ), - mStyleName(""), - mBackgroundVisual(), - mBackgroundColor(Color::TRANSPARENT), - mStartingPinchScale( NULL ), - mKeyEventSignal(), - mPinchGestureDetector(), - mPanGestureDetector(), - mTapGestureDetector(), - mLongPressGestureDetector(), - mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), - mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ) -{ -} + : mControlImpl( controlImpl ), + mStyleName(""), + mBackgroundColor(Color::TRANSPARENT), + mStartingPinchScale( NULL ), + mKeyEventSignal(), + mPinchGestureDetector(), + mPanGestureDetector(), + mTapGestureDetector(), + mLongPressGestureDetector(), + mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mIsKeyboardNavigationSupported( false ), + mIsKeyboardFocusGroup( false ) + { + } ~Impl() { @@ -290,7 +385,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; @@ -312,13 +407,13 @@ public: case Toolkit::Control::Property::BACKGROUND: { const Property::Map* map = value.GetMap(); - if( map ) + if( map && !map->Empty() ) { controlImpl.SetBackground( *map ); } 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; @@ -362,9 +457,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; @@ -379,9 +475,10 @@ 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; @@ -397,9 +494,8 @@ public: // Data Control& mControlImpl; - RegisteredVisuals mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used. + 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; @@ -446,11 +542,6 @@ Toolkit::Control Control::New() return handle; } -Control::~Control() -{ - delete mImpl; -} - void Control::SetStyleName( const std::string& styleName ) { if( styleName != mImpl->mStyleName ) @@ -473,17 +564,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 @@ -493,31 +579,35 @@ 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 ) + 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 ) { - 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) @@ -659,63 +749,57 @@ 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, visual, true ); +} + +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 - { - actorToRegister = placementActor; - } - - if ( !mImpl->mVisuals.Empty() ) + if( !mImpl->mVisuals.Empty() ) { - RegisteredVisuals::Iterator iter; - // Check if visual (index) is already registered. Replace if so. - if ( FindVisual( index, mImpl->mVisuals, iter ) ) + RegisteredVisualContainer::Iterator iter; + // Check if visual (index) is already registered. Replace if so. + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if( (*iter)->visual && self.OnStage() ) { - 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; + Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); } + (*iter)->visual = visual; + visualReplaced = true; + } } - if ( !visualReplaced ) // New registration entry + if( !visualReplaced ) // New registration entry { - mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, actorToRegister ) ); + mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, enabled ) ); } - if( visual && self.OnStage() ) + if( visual && self.OnStage() && enabled ) { - visual.SetOnStage( placementActor ); + Toolkit::GetImplementation(visual).SetOnStage( self ); } } void Control::UnregisterVisual( Property::Index index ) { - RegisteredVisuals::Iterator iter; + 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 ); } } Toolkit::Visual::Base Control::GetVisual( Property::Index index ) const { - RegisteredVisuals::Iterator iter; + RegisteredVisualContainer::Iterator iter; if ( FindVisual( index, mImpl->mVisuals, iter ) ) { return (*iter)->visual; @@ -724,22 +808,108 @@ Toolkit::Visual::Base Control::GetVisual( Property::Index index ) const return Toolkit::Visual::Base(); } -Actor Control::GetPlacementActor( Property::Index index ) const +void Control::EnableVisual( Property::Index index, bool enable ) { - RegisteredVisuals::Iterator iter; + RegisteredVisualContainer::Iterator iter; if ( FindVisual( index, mImpl->mVisuals, iter ) ) { - if( (*iter)->placementActor ) + if ( (*iter)->enabled == enable ) { - return (*iter)->placementActor; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual Already enabled set (%s) \n", enable?"enabled":"disabled"); + return; } - else + + (*iter)->enabled = enable; + Actor parentActor = Self(); + if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. { - return Self(); + 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. + } } } +} - return Actor(); +bool Control::IsVisualEnabled( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + return (*iter)->enabled; + } + return false; +} + +Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle ) +{ + 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 = child.GetPropertyIndex( 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::OnAccessibilityActivated() @@ -825,6 +995,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. @@ -928,40 +1103,30 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - for(RegisteredVisuals::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size() ); + + 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. - if( (*iter)->visual ) + // Check whether the visual is empty and enabled + if( (*iter)->visual && (*iter)->enabled ) { - if( (*iter)->placementActor ) - { - (*iter)->visual.SetOnStage( (*iter)->placementActor ); - } - else - { - Actor self( Self() ); - (*iter)->visual.SetOnStage( self ); - } + 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::OnStageDisconnection() { - for(RegisteredVisuals::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) + 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 ); } } } @@ -990,10 +1155,13 @@ void Control::OnChildRemove(Actor& child) 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 ); + Property::Map transformMap; + SetDefaultTransform( transformMap ); + visual.SetTransformAndSize( transformMap, size ); } } @@ -1028,6 +1196,15 @@ 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 ) + { + Vector2 controlSize( size ); + Property::Map transformMap; + SetDefaultTransform( transformMap ); + visual.SetTransformAndSize( transformMap, controlSize ); + } } void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) @@ -1036,11 +1213,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; }