projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Vector) Ensure that all animation data is applied at once
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-BloomView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
index
fa3f10c
..
dc9e771
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
@@
-124,8
+124,8
@@
int UtcDaliBloomViewAddRemove(void)
DALI_TEST_CHECK( !actor.OnStage() );
DALI_TEST_CHECK( !actor.OnStage() );
- view.SetP
arentOrigin(ParentOrigin::CENTER
);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.SetP
roperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER
);
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(actor);
Stage::GetCurrent().Add(view);
view.Add(actor);
Stage::GetCurrent().Add(view);
@@
-149,8
+149,8
@@
int UtcDaliBloomActivateDeactivate(void)
RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList();
DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
- view.SetP
arentOrigin(
ParentOrigin::CENTER);
- view.Set
Size(
Stage::GetCurrent().GetSize());
+ view.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER);
+ view.Set
Property( Actor::Property::SIZE,
Stage::GetCurrent().GetSize());
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
view.Add(Actor::New());
Stage::GetCurrent().Add(view);
view.Activate();
@@
-214,13
+214,13
@@
int UtcDaliBloomOnSizeSet(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- Vector3 size( 200.0f, 300.0f,
20
0.0f );
- view.Set
Size(
size );
+ Vector3 size( 200.0f, 300.0f, 0.0f );
+ view.Set
Property( Actor::Property::SIZE,
size );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- DALI_TEST_EQUALS( view.GetCurrent
Size(
), size, TEST_LOCATION );
+ DALI_TEST_EQUALS( view.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
), size, TEST_LOCATION );
END_TEST;
}
END_TEST;
}