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
Remove some public Setter/Getter APIs from Dali::Actor
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-TextLabel.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index
2d6b092
..
5735515
100755
(executable)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@
-1119,8
+1119,8
@@
int UtcDaliToolkitTextlabelEllipsis(void)
Stage::GetCurrent().Add( label );
// Turn on all the effects
Stage::GetCurrent().Add( label );
// Turn on all the effects
- label.Set
AnchorPoint(
AnchorPoint::CENTER );
- label.SetP
arentOrigin(
ParentOrigin::CENTER );
+ label.Set
Property( Actor::Property::ANCHOR_POINT,
AnchorPoint::CENTER );
+ label.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER );
label.SetSize( 360.0f, 10.f );
try
label.SetSize( 360.0f, 10.f );
try
@@
-1481,7
+1481,7
@@
int UtcDaliToolkitTextLabelBitmapFont(void)
application.Render();
// The text has been rendered if the height of the text-label is the height of the line.
application.Render();
// The text has been rendered if the height of the text-label is the height of the line.
- DALI_TEST_EQUALS( label.GetCurrent
Size(
).height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ DALI_TEST_EQUALS( label.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
).height, 34.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
@@
-1579,7
+1579,7
@@
int UtcDaliToolkitTextlabelMaxTextureSet(void)
const int maxTextureSize = Dali::GetMaxTextureSize();
// Whether the rendered text is greater than maxTextureSize
const int maxTextureSize = Dali::GetMaxTextureSize();
// Whether the rendered text is greater than maxTextureSize
- DALI_TEST_CHECK( label.GetCurrent
Size(
).height > maxTextureSize );
+ DALI_TEST_CHECK( label.GetCurrent
Property< Vector3 >( Actor::Property::SIZE
).height > maxTextureSize );
// Check if the number of renderers is greater than 1.
DALI_TEST_CHECK( label.GetRendererCount() > 1u );
// Check if the number of renderers is greater than 1.
DALI_TEST_CHECK( label.GetRendererCount() > 1u );