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 "Layout fixes." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-ViewModel.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
index
a7df603
..
8d7c717
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-ViewModel.cpp
@@
-586,10
+586,10
@@
int UtcDaliTextViewModelElideText02(void)
float positions01[] = { 0.f, 8.f, 16.f, 26.f, 33.f, 41.f, 45.f, 54.f, 64.0f };
Size textSize02( 80.f, 100.f );
float positions01[] = { 0.f, 8.f, 16.f, 26.f, 33.f, 41.f, 45.f, 54.f, 64.0f };
Size textSize02( 80.f, 100.f );
- float positions02[] = { 7
5.f, 66.f, 57.f, 53.f, 46.f, 41.f, 33.f, 26
.0f };
+ float positions02[] = { 7
2.f, 63.f, 54.f, 50.f, 43.f, 38.f, 30.f, 10
.0f };
Size textSize03( 80.f, 100.f );
Size textSize03( 80.f, 100.f );
- float positions03[] = { 7
9.f, 74.f, 71.f, 66.f, 58.f, 56.f, 52.f, 51.f, 46.f, 36.f, 33.f, 25.f, 22
.f };
+ float positions03[] = { 7
4.f, 69.f, 66.f, 61.f, 53.f, 51.f, 47.f, 46.f, 41.f, 31.f, 28.f, 20.f, 7
.f };
Size textSize04( 80.f, 10.f );
float positions04[] = { 2.f };
Size textSize04( 80.f, 10.f );
float positions04[] = { 2.f };