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
Merge "Type registry macros made namespace-generic: toolkit" into tizen
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-TextField.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
index
da5c595
..
9c3d4f2
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@
-213,9
+213,9
@@
int UtcDaliTextFieldSetPropertyP(void)
field.SetProperty( TextField::Property::CURSOR_BLINK_DURATION, 10.0f );
DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_DURATION ), 10.0f, TEST_LOCATION );
field.SetProperty( TextField::Property::CURSOR_BLINK_DURATION, 10.0f );
DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_DURATION ), 10.0f, TEST_LOCATION );
- // Blink interval
gets converted to milliseconds....
+ // Blink interval
field.SetProperty( TextField::Property::CURSOR_BLINK_INTERVAL, 1.0f );
field.SetProperty( TextField::Property::CURSOR_BLINK_INTERVAL, 1.0f );
- DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_INTERVAL ), 1
000
.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( field.GetProperty<float>( TextField::Property::CURSOR_BLINK_INTERVAL ), 1.0f, TEST_LOCATION );
// Decoration bounding box
field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( 0, 0, 1, 1 ) );
// Decoration bounding box
field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( 0, 0, 1, 1 ) );