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 "Handle Emoji clustering for cursor handling" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Controller.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
index
c89a025
..
b079ce3
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp
@@
-722,8
+722,8
@@
int UtcDaliTextControllerSetGetLineSpacingProperty(void)
// single line, line spacing = 0px
{
const float EXPECTED_SPACING = 0.0f;
// single line, line spacing = 0px
{
const float EXPECTED_SPACING = 0.0f;
- const Vector2 EXPECTED_LAYOUT_SIZE( 3
60
.0f, 19.0f);
- const Vector3 EXPECTED_NATURAL_SIZE( 3
6
0.0f, 20.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
49
.0f, 19.0f);
+ const Vector3 EXPECTED_NATURAL_SIZE( 3
5
0.0f, 20.0f, 0.0f );
controller->SetText(textSingle);
controller->Relayout(size);
controller->SetText(textSingle);
controller->Relayout(size);
@@
-741,8
+741,8
@@
int UtcDaliTextControllerSetGetLineSpacingProperty(void)
// single line, line spacing = 20px
{
const float EXPECTED_SPACING = 20.0f;
// single line, line spacing = 20px
{
const float EXPECTED_SPACING = 20.0f;
- const Vector2 EXPECTED_LAYOUT_SIZE( 3
60
.0f, 19.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 3
6
0.0f, 40.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
49
.0f, 19.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 3
5
0.0f, 40.0f, 0.0f );
controller->SetText(textSingle);
controller->Relayout(size);
controller->SetText(textSingle);
controller->Relayout(size);
@@
-761,8
+761,8
@@
int UtcDaliTextControllerSetGetLineSpacingProperty(void)
// multi-line, line spacing = 0px
{
const float EXPECTED_SPACING = 0.0f;
// multi-line, line spacing = 0px
{
const float EXPECTED_SPACING = 0.0f;
- const Vector2 EXPECTED_LAYOUT_SIZE( 3
50
.0f, 39.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 12
4
.0f, 58.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
39
.0f, 39.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 12
2
.0f, 58.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);
@@
-781,8
+781,8
@@
int UtcDaliTextControllerSetGetLineSpacingProperty(void)
// multi-line, line spacing = 20px
{
const float EXPECTED_SPACING = 20.0f;
// multi-line, line spacing = 20px
{
const float EXPECTED_SPACING = 20.0f;
- const Vector2 EXPECTED_LAYOUT_SIZE( 12
4
.0f, 57.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 12
4
.0f, 118.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 12
1
.0f, 57.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 12
2
.0f, 118.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);
@@
-801,8
+801,8
@@
int UtcDaliTextControllerSetGetLineSpacingProperty(void)
// multi-line, line spacing = 30px
{
const float EXPECTED_SPACING = 30.0f;
// multi-line, line spacing = 30px
{
const float EXPECTED_SPACING = 30.0f;
- const Vector2 EXPECTED_LAYOUT_SIZE( 12
4
.0f, 117.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 12
4
.0f, 148.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 12
1
.0f, 117.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 12
2
.0f, 148.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);