{
}
-void DummyControlImpl::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual )
+void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual )
{
- Control::RegisterVisual( index, placementActor, visual );
+ Control::RegisterVisual( index, visual );
}
-void DummyControlImpl::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual, bool enabled )
+void DummyControlImpl::RegisterVisual( Property::Index index, Toolkit::Visual::Base visual, bool enabled )
{
- Control::RegisterVisual( index, placementActor, visual, enabled );
+ Control::RegisterVisual( index, visual, enabled );
}
void DummyControlImpl::UnregisterVisual( Property::Index index )
return Control::IsVisualEnabled( index );
}
-Actor DummyControlImpl::GetPlacementActor( Property::Index index )
-{
- return Control::GetPlacementActor( index );
-}
-
Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& transition )
{
return Control::CreateTransition( transition );
inline TapGestureDetector GetTapGestureDetector() const { return Internal::Control::GetTapGestureDetector(); }
inline LongPressGestureDetector GetLongPressGestureDetector() const { return Internal::Control::GetLongPressGestureDetector(); }
- void RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual);
- void RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual, bool enabled );
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base visual);
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base visual, bool enabled );
void UnregisterVisual( Property::Index index );
void EnableVisual( Property::Index index, bool enabled );
bool IsVisualEnabled( Property::Index index );
Toolkit::Visual::Base GetVisual( Property::Index index );
- Actor GetPlacementActor( Property::Index index );
Animation CreateTransition( const Toolkit::TransitionData& transition );
// Used to test signal connections
DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
Property::Index index =1;
- Actor placementActor = Actor::New();
DALI_TEST_CHECK( !dummyImpl.GetVisual( index ) );
- DALI_TEST_CHECK( !dummyImpl.GetPlacementActor( index ) );
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base visual;
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( index, placementActor, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == placementActor );
Property::Map newMap;
newMap[Visual::Property::TYPE] = Visual::COLOR;
DALI_TEST_CHECK(visual);
// ReRegister with altered color visual
- dummyImpl.RegisterVisual( index, placementActor, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == placementActor );
tet_result(TET_PASS);
DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
Property::Index index =1;
- Actor placementActor = Actor::New();
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base visual;
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( index, placementActor, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == placementActor );
// ReRegister to self
- dummyImpl.RegisterVisual( index, dummy, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == dummy );
END_TEST;
}
objectDestructionTracker.Start( dummy );
Property::Index index = 1;
- Actor placementActor = Actor::New();
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base visual;
DALI_TEST_CHECK(visual);
// Register to self
- dummyImpl.RegisterVisual( index, dummy, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), false, TEST_LOCATION ); // Control not destroyed yet
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == dummy );
}
DALI_TEST_EQUALS( objectDestructionTracker.IsDestroyed(), true, TEST_LOCATION ); // Should be destroyed
DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
Property::Index index =1;
- Actor placementActor = Actor::New();
-
Property::Index index2 =2;
- Actor secondPlacementActor = Actor::New();
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base visual;
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( index, placementActor, visual );
+ dummyImpl.RegisterVisual( index, visual );
Property::Map newMap;
newMap[Visual::Property::TYPE] = Visual::COLOR;
DALI_TEST_CHECK( secondVisual );
// ReRegister with altered color visual
- dummyImpl.RegisterVisual( index2, secondPlacementActor, secondVisual );
+ dummyImpl.RegisterVisual( index2, secondVisual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == placementActor );
-
DALI_TEST_CHECK( dummyImpl.GetVisual( index2 ) == secondVisual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index2 ) == secondPlacementActor );
END_TEST;
}
DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
Property::Index index =1;
- Actor placementActor = Actor::New();
Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get();
Toolkit::Visual::Base visual;
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( index, placementActor, visual );
+ dummyImpl.RegisterVisual( index, visual );
DALI_TEST_CHECK( dummyImpl.GetVisual( index ) == visual );
- DALI_TEST_CHECK( dummyImpl.GetPlacementActor( index ) == placementActor );
// Unregister visual
dummyImpl.UnregisterVisual( index );
DALI_TEST_CHECK( !dummyImpl.GetVisual( index ) );
- DALI_TEST_CHECK( !dummyImpl.GetPlacementActor( index ) );
END_TEST;
}
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( TEST_PROPERTY, dummy, visual, false );
+ dummyImpl.RegisterVisual( TEST_PROPERTY, visual, false );
DALI_TEST_CHECK( dummyImpl.GetVisual( TEST_PROPERTY ) == visual );
DALI_TEST_CHECK( dummyImpl.IsVisualEnabled( TEST_PROPERTY ) == false );
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( TEST_PROPERTY, dummy, visual );
+ dummyImpl.RegisterVisual( TEST_PROPERTY, visual );
Stage::GetCurrent().Add(dummy);
DALI_TEST_CHECK(visual);
// Register index with a color visual
- dummyImpl.RegisterVisual( TEST_PROPERTY, dummy, visual, false );
+ dummyImpl.RegisterVisual( TEST_PROPERTY, visual, false );
Stage::GetCurrent().Add(dummy);
// Render and notify
DALI_TEST_CHECK(visual2);
// Register index with a color visual
- dummyImpl.RegisterVisual( TEST_PROPERTY1, dummy, visual1 );
+ dummyImpl.RegisterVisual( TEST_PROPERTY1, visual1 );
// Register second index with a color visual
- dummyImpl.RegisterVisual( TEST_PROPERTY2, dummy, visual2 );
+ dummyImpl.RegisterVisual( TEST_PROPERTY2, visual2 );
Stage::GetCurrent().Add(dummy);
// Render and notify
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( !anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( !anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( !anim );
visual.SetName( "visual1" );
Property::Index visualIndex = Control::CONTROL_PROPERTY_END_INDEX + 1;
- dummyImpl.RegisterVisual( visualIndex, actor, visual );
+ dummyImpl.RegisterVisual( visualIndex, visual );
Animation anim = dummyImpl.CreateTransition( transition );
DALI_TEST_CHECK( !anim );
visual = visualFactory.CreateVisual( map );
- RegisterVisual( visualIndex, placementActor, visual );
+ RegisterVisual( visualIndex, visual );
SetupContent( *contentActor, placementActor ); //
contentActor->SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mImage = image;
- Actor self( Self() );
mVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
- RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, mVisual );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );
RelayoutRequest();
mImage.Reset();
mPropertyMap = map;
- Actor self( Self() );
mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap );
- RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, mVisual );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
mImageSize = size;
}
- Actor self( Self() );
mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size );
- RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, mVisual );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
mVisual.SetSize( mSizeSet );
visualMap[Toolkit::TextVisual::Property::RENDERING_BACKEND] = static_cast<int>( DEFAULT_RENDERING_BACKEND );
mVisual = Toolkit::VisualFactory::Get().CreateVisual( visualMap );
- RegisterVisual( Toolkit::TextLabel::Property::TEXT, self, mVisual );
+ RegisterVisual( Toolkit::TextLabel::Property::TEXT, mVisual );
Internal::Visual::Base& visualBase = Toolkit::GetImplementation( mVisual );
TextVisual* textVisual = static_cast<TextVisual*>( &visualBase );
{
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 HandleIndex
}
}
- // 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 = self.GetPropertyIndex( propertyKey );
if( index != Property::INVALID_INDEX )
{
- // It's a placement actor property:
- return HandleIndex( 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);
+ // @todo Need to use correct renderer index
+ Renderer renderer = self.GetRendererAt(0);
Property::Index index = renderer.GetPropertyIndex( propertyKey );
if( index != Property::INVALID_INDEX )
{
void Control::SetBackgroundColor( const Vector4& color )
{
- Actor self( Self() );
mImpl->mBackgroundColor = color;
Property::Map map;
map[ Toolkit::VisualProperty::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 );
+ RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual );
if( mImpl->mBackgroundVisual )
{
mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
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 );
+ RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual );
if( mImpl->mBackgroundVisual )
{
mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
void Control::SetBackgroundImage( Image image )
{
- Actor self( Self() );
mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
- RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual );
+ RegisterVisual( Toolkit::Control::Property::BACKGROUND, mImpl->mBackgroundVisual );
if( mImpl->mBackgroundVisual )
{
mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND );
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
- {
- actorToRegister = placementActor;
- }
-
if ( !mImpl->mVisuals.Empty() )
{
RegisteredVisualContainer::Iterator iter;
{
if( (*iter)->visual && self.OnStage() )
{
- if( (*iter)->placementActor )
- {
- (*iter)->visual.SetOffStage( (*iter)->placementActor );
- }
- else
- {
- (*iter)->visual.SetOffStage( self );
- }
+ (*iter)->visual.SetOffStage( self );
}
(*iter)->visual = visual;
- (*iter)->placementActor = actorToRegister;
visualReplaced = true;
}
}
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 );
+ visual.SetOnStage( self );
}
}
(*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 )
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;
}
else
{
- // Is it a placement actor/visual pair?;
handleIndex = GetVisualProperty( *this, mImpl->mVisuals,
animator->objectName,
animator->propertyKey );
{
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 );
- }
+ Actor self( Self() );
+ (*iter)->visual.SetOnStage( 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
if( (*iter)->visual )
{
- if( (*iter)->placementActor )
- {
- (*iter)->visual.SetOffStage( (*iter)->placementActor );
- }
- else
- {
- Actor self( Self() );
- (*iter)->visual.SetOffStage( self );
- }
+ Actor self( Self() );
+ (*iter)->visual.SetOffStage( self );
}
}
}
* @SINCE_1_2.0
*
* @param[in] index The Property index of the visual, used to reference visual
- * @param[in] placementActor The actor used to by the visual.
* @param[in] visual The visual to register
- * @note Derived class should not call visual.SetOnStage(placementActor). It is the responsibility of the base class to connect/disconnect registered visual to stage.
+ * @note Derived class should not call visual.SetOnStage(actor). It is the responsibility of the base class to connect/disconnect registered visual to stage.
* Use below API with enabled set to false if derived class wishes to control when visual is staged.
*/
- void RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual );
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual );
/**
* @brief Register a visual by Property Index, linking an Actor to visual when required.
* @SINCE_1_2.11
*
* @param[in] index The Property index of the visual, used to reference visual
- * @param[in] placementActor The actor used to by the visual.
* @param[in] visual The visual to register
* @param[in] enabled false if derived class wants to control when visual is set on stage.
*
*/
- void RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual, bool enabled );
+ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled );
/**
* @brief Erase the entry matching the given index from the list of registered visuals
bool IsVisualEnabled( Property::Index index ) const;
/**
- * @brief Retrieve the placement actor associated with the given index.
- *
- * @SINCE_1_2.2
- *
- * @@param[in] index The Property index of the visual.
- * @return Then placement actor if exist, otherwise empty handle.
- * @note For managing object life-cycle, do not store the returned placement actor as a member which increments its reference count.
- */
- Actor GetPlacementActor( Property::Index index ) const;
-
- /**
* @brief Create a transition effect on the control.
*
* @SINCE_1_2.12