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=ab171ad56b057409508e355605471de73ba9a1e7;hp=6c4b2117094f75b622761421d4d8b4f6a6a7c79d;hb=863244a09761c6e22a224299b6155a285e21d6ec;hpb=1ff26466c5458cda1de2997cd4e27b014ff0275a diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 6c4b211..ab171ad 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -38,11 +39,13 @@ #include #include #include +#include #include #include #include #include #include +#include namespace Dali { @@ -64,25 +67,24 @@ 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) {} + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, bool aEnabled) : + index(aIndex), visual(aVisual), enabled(aEnabled) {} }; -struct VisualProperty +struct HandleIndex { Handle handle; ///< a handle to the target object Property::Index index; ///< The index of a property provided by the referenced object - VisualProperty( ) + HandleIndex( ) : handle(), index( Property::INVALID_INDEX ) { } - VisualProperty( Handle& handle, Property::Index index ) + HandleIndex( Handle& handle, Property::Index index ) : handle( handle ), index( index ) { @@ -107,7 +109,7 @@ bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals return false; } -VisualProperty GetVisualProperty( +HandleIndex GetVisualProperty( Internal::Control& controlImpl, RegisteredVisualContainer& visuals, const std::string& visualName, @@ -115,7 +117,7 @@ VisualProperty GetVisualProperty( { #if defined(DEBUG_ENABLED) std::ostringstream oss; - oss << "Control::GetVisualProperty(" << visualName << ", " << propertyKey << ")" << std::endl; + oss << "Control::GetHandleIndex(" << visualName << ", " << propertyKey << ")" << std::endl; DALI_LOG_INFO( gLogFilter, Debug::General, oss.str().c_str() ); #endif @@ -129,48 +131,52 @@ VisualProperty GetVisualProperty( } } - // Does either it's renderer or placement actor have an associated property? + // Does it's renderer have an associated property? if( iter != visuals.End() ) { - Actor placementActor = (*iter)->placementActor; - if( !placementActor ) - { - placementActor = controlImpl.Self(); - } - - Property::Index index = placementActor.GetPropertyIndex( propertyKey ); + Actor self = controlImpl.Self(); + Property::Index index = DevelHandle::GetPropertyIndex( self, propertyKey ); if( index != Property::INVALID_INDEX ) { - // It's a placement actor property: - return VisualProperty( placementActor, index ); + // It's an actor property: + return HandleIndex( self, index ); } else { // Check if it is a renderer property: - if( placementActor.GetRendererCount() > 0 ) + if( self.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 ); + // @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 VisualProperty( renderer, index ); + return HandleIndex( 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() ); + DALI_LOG_WARNING( "Control::GetHandleIndex(%s, %s) No renderers\n", visualName.c_str(), oss.str().c_str() ); } } } Handle handle; - return VisualProperty( handle, Property::INVALID_INDEX ); + 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 @@ -298,7 +304,6 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackgroundVisual(), mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), @@ -381,7 +386,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,14 +407,25 @@ 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; @@ -453,9 +469,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,9 +487,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; @@ -490,7 +508,6 @@ public: Control& mControlImpl; 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; @@ -537,11 +554,6 @@ Toolkit::Control Control::New() return handle; } -Control::~Control() -{ - delete mImpl; -} - void Control::SetStyleName( const std::string& styleName ) { if( styleName != mImpl->mStyleName ) @@ -564,17 +576,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 +591,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 +760,42 @@ 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; - } - - if ( !mImpl->mVisuals.Empty() ) - { - RegisteredVisualContainer::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, 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 number of registered visuals(%d)\n", mImpl->mVisuals.Size() ); + } void Control::UnregisterVisual( Property::Index index ) @@ -805,6 +803,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 +828,23 @@ void Control::EnableVisual( Property::Index index, bool enable ) { if ( (*iter)->enabled == enable ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual Already enabled set (%s) \n", 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 Visual(%d) on stage \n", 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 Visual(%d) off stage \n", index ); + Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. } } } @@ -862,24 +860,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,37 +873,36 @@ Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle iter != end; ++iter ) { TransitionData::Animator* animator = (*iter); - VisualProperty visualProperty; + 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 ); - visualProperty = VisualProperty( child, propertyIndex ); + Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey ); + handleIndex = HandleIndex( child, propertyIndex ); } else { - // Is it a placement actor/visual pair?; - visualProperty = GetVisualProperty( *this, mImpl->mVisuals, + handleIndex = GetVisualProperty( *this, mImpl->mVisuals, animator->objectName, animator->propertyKey ); } - if( visualProperty.handle && visualProperty.index != Property::INVALID_INDEX ) + if( handleIndex.handle && handleIndex.index != Property::INVALID_INDEX ) { if( animator->animate == false ) { if( animator->targetValue.GetType() != Property::NONE ) { - visualProperty.handle.SetProperty( visualProperty.index, animator->targetValue ); + handleIndex.handle.SetProperty( handleIndex.index, animator->targetValue ); } } else { if( animator->initialValue.GetType() != Property::NONE ) { - visualProperty.handle.SetProperty( visualProperty.index, animator->initialValue ); + handleIndex.handle.SetProperty( handleIndex.index, animator->initialValue ); } if( ! transition ) @@ -933,7 +912,7 @@ Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle transition = Dali::Animation::New( 0.1f ); } - transition.AnimateTo( Property( visualProperty.handle, visualProperty.index ), + transition.AnimateTo( Property( handleIndex.handle, handleIndex.index ), animator->targetValue, animator->alphaFunction, TimePeriod( animator->timePeriodDelay, @@ -946,7 +925,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 +1008,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. @@ -1065,10 +1048,12 @@ void Control::OnInitialize() void Control::OnControlChildAdd( Actor& child ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: OnControlChildAdd() is deprecated and will be removed from next release. Override OnChildAdd instead.\n" ); } void Control::OnControlChildRemove( Actor& child ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: OnControlChildRemove() is deprecated and will be removed from next release. Override OnChildRemove instead.\n" ); } void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) @@ -1133,20 +1118,16 @@ 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() ); + 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 - { - 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 ); } } } @@ -1155,18 +1136,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 ); } } } @@ -1195,10 +1170,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 ); } } @@ -1233,6 +1211,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 ) @@ -1241,11 +1228,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; }