visual.SetDepthIndex( 1.f );
- Actor actor = Actor::New();
- actor.SetSize(200.f, 200.f);
- Stage::GetCurrent().Add( actor );
- visual.SetOnStage( actor );
+ DummyControl dummyControl = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummyControl.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+
+ dummyControl.SetSize(200.f, 200.f);
+ Stage::GetCurrent().Add( dummyControl );
- int depthIndex = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
+
+ int depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
DALI_TEST_EQUALS( depthIndex, 1, TEST_LOCATION );
DALI_TEST_EQUALS( visual.GetDepthIndex(), 1.f, TEST_LOCATION );
visual.SetDepthIndex( -1.f );
- depthIndex = actor.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
+ depthIndex = dummyControl.GetRendererAt(0u).GetProperty<int>( Renderer::Property::DEPTH_INDEX );
DALI_TEST_EQUALS( depthIndex, -1, TEST_LOCATION );
DALI_TEST_EQUALS( visual.GetDepthIndex(), -1.f, TEST_LOCATION );
propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
Visual::Base visual = factory.CreateVisual( propertyMap );
- Actor actor = Actor::New();
- actor.SetSize(200.f, 200.f);
- Stage::GetCurrent().Add( actor );
-
- application.SendNotification();
- application.Render(0);
- DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
- visual.SetOnStage( actor );
- application.SendNotification();
- application.Render(0);
- DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+ actor.SetSize(200.f, 200.f);
- visual.SetOffStage( actor );
application.SendNotification();
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
- END_TEST;
-}
-
-int UtcDaliVisualRemoveAndReset(void)
-{
- ToolkitTestApplication application;
- tet_infoline( "intUtcDaliVisualRemoveAndReset" );
-
- VisualFactory factory = VisualFactory::Get();
-
- Actor actor = Actor::New();
- actor.SetSize(200.f, 200.f);
Stage::GetCurrent().Add( actor );
- Visual::Base imageVisual;
- // test calling RemoveAndReset with an empty handle
- try
- {
- imageVisual.RemoveAndReset( actor );
- tet_result(TET_PASS);
- }
- catch (DaliException& exception)
- {
- tet_result(TET_FAIL);
- }
-
- Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200));
- imageVisual = factory.CreateVisual(image);
- DALI_TEST_CHECK( imageVisual );
-
- imageVisual.SetOnStage( actor );
application.SendNotification();
application.Render(0);
DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
- imageVisual.RemoveAndReset( actor );
+ Stage::GetCurrent().Remove( actor );
+
application.SendNotification();
application.Render(0);
- DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); // visual is removed from actor
- DALI_TEST_CHECK( !imageVisual ); // visual is reset
+ DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
END_TEST;
}
+
int UtcDaliVisualGetPropertyMap1(void)
{
ToolkitTestApplication application;
DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
// change the blend color
- Actor actor;
- colorVisual.RemoveAndReset( actor );
propertyMap[ColorVisual::Property::MIX_COLOR] = Color::CYAN;
colorVisual = factory.CreateVisual( propertyMap );
colorVisual.CreatePropertyMap( resultMap );
DALI_TEST_CHECK( batchImageVisual );
- Actor actor = Actor::New();
- batchImageVisual.SetOnStage( actor );
+ DummyControl dummyControl = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummyControl.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, batchImageVisual );
+ Stage::GetCurrent().Add( dummyControl );
- DALI_TEST_CHECK( actor.GetRendererCount() == 1u );
+ DALI_TEST_CHECK( dummyControl.GetRendererCount() == 1u );
END_TEST;
}
propertyMap.Insert(BorderVisual::Property::SIZE, 5.f);
Visual::Base borderVisual = factory.CreateVisual( propertyMap );
- Actor actor = Actor::New();
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, borderVisual );
actor.SetSize(2000, 2000);
actor.SetParentOrigin(ParentOrigin::CENTER);
Stage::GetCurrent().Add(actor);
- borderVisual.SetOnStage( actor );
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
propertyMap.Insert(BorderVisual::Property::SIZE, 5.f);
Visual::Base borderVisual = factory.CreateVisual( propertyMap );
- Actor actor = Actor::New();
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, borderVisual );
actor.SetSize(2000, 2000);
actor.SetParentOrigin(ParentOrigin::CENTER);
Stage::GetCurrent().Add(actor);
- borderVisual.SetOnStage( actor );
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
Visual::Base borderVisual = factory.CreateVisual( propertyMap );
- Actor actor = Actor::New();
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, borderVisual );
actor.SetSize(2000, 2000);
actor.SetParentOrigin(ParentOrigin::CENTER);
Stage::GetCurrent().Add(actor);
- borderVisual.SetOnStage( actor );
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
Visual::Base borderVisual = factory.CreateVisual( propertyMap );
- Actor actor = Actor::New();
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, borderVisual );
actor.SetSize(2000, 2000);
actor.SetParentOrigin(ParentOrigin::CENTER);
actor.SetColor(Color::BLACK);
Stage::GetCurrent().Add(actor);
- borderVisual.SetOnStage( actor );
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION);
}
//Put the visual on the stage
- Actor actor = Actor::New();
- actor.SetSize(200.f, 200.f);
- Stage::GetCurrent().Add( actor );
- visual.SetOnStage( actor );
+ DummyControl actor = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(actor.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+ actor.SetSize(2000, 2000);
+ actor.SetParentOrigin(ParentOrigin::CENTER);
+ Stage::GetCurrent().Add(actor);
+
application.SendNotification();
application.Render(0);
Renderer renderer( actor.GetRendererAt(0) );
properties[Dali::Toolkit::ImageVisual::Property::URL] = TEST_NPATCH_FILE_NAME;
Visual::Base visual = factory.CreateVisual( properties );
- Actor dummy = Actor::New();
+
// trigger creation through setting on stage
- visual.SetOnStage( dummy );
+ DummyControl dummy = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummy.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+ dummy.SetSize(2000, 2000);
+ dummy.SetParentOrigin(ParentOrigin::CENTER);
+ Stage::GetCurrent().Add(dummy);
Renderer renderer = dummy.GetRendererAt( 0 );
Shader shader2 = renderer.GetShader();
END_TEST;
}
-
int UtcDaliGradientVisualBlendMode(void)
{
ToolkitTestApplication application;
-
VisualFactory factory = VisualFactory::Get();
Visual::Base opaqueGradientVisual = factory.CreateVisual(
END_TEST;
}
+
+int UtcDaliVisualRendererRemovalAndReAddition(void)
+{
+ ToolkitTestApplication application;
+ tet_infoline( "UtcDaliVisualRendererRemoval" );
+
+ VisualFactory factory = VisualFactory::Get();
+ Property::Map propertyMap;
+ propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
+ propertyMap.Insert(ColorVisual::Property::MIX_COLOR, Color::BLUE);
+ Visual::Base visual = factory.CreateVisual( propertyMap );
+
+ visual.SetDepthIndex( 1.f );
+
+ DummyControl dummyControl = DummyControl::New();
+ DummyControlImpl& dummyImpl = static_cast<DummyControlImpl&>(dummyControl.GetImplementation());
+ dummyImpl.RegisterVisual( Control::CONTROL_PROPERTY_END_INDEX + 1, visual );
+ DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
+
+ dummyControl.SetSize(200.f, 200.f);
+ tet_infoline( "Add control with visual to stage and check renderer count is 1" );
+
+ Stage::GetCurrent().Add( dummyControl );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+
+ tet_infoline( "Remove control with visual from stage and check renderer count is 0" );
+ Stage::GetCurrent().Remove( dummyControl );
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 0, TEST_LOCATION );
+
+ tet_infoline( "Re-add control with visual to stage and check renderer count is still 1" );
+
+ Stage::GetCurrent().Add( dummyControl );
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( dummyControl.GetRendererCount(), 1, TEST_LOCATION );
+
+ END_TEST;
+}