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 "Text - Layout improvement." 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
66b7149
..
d37a1db
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-574,8
+574,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
26
.0f, 19.0f);
- const Vector3 EXPECTED_NATURAL_SIZE( 3
26
.0f, 20.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
42
.0f, 19.0f);
+ const Vector3 EXPECTED_NATURAL_SIZE( 3
42
.0f, 20.0f, 0.0f );
controller->SetText(textSingle);
controller->Relayout(size);
controller->SetText(textSingle);
controller->Relayout(size);
@@
-593,8
+593,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
26
.0f, 19.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 3
26
.0f, 40.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
42
.0f, 19.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 3
42
.0f, 40.0f, 0.0f );
controller->SetText(textSingle);
controller->Relayout(size);
controller->SetText(textSingle);
controller->Relayout(size);
@@
-613,8
+613,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
18
.0f, 39.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 11
6
.0f, 58.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 3
32
.0f, 39.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 11
8
.0f, 58.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);
@@
-633,8
+633,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( 11
5
.0f, 57.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 11
6
.0f, 118.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 11
8
.0f, 57.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 11
8
.0f, 118.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);
@@
-653,8
+653,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( 11
5
.0f, 117.0f );
- const Vector3 EXPECTED_NATURAL_SIZE( 11
6
.0f, 148.0f, 0.0f );
+ const Vector2 EXPECTED_LAYOUT_SIZE( 11
8
.0f, 117.0f );
+ const Vector3 EXPECTED_NATURAL_SIZE( 11
8
.0f, 148.0f, 0.0f );
controller->SetText(textMulti);
controller->Relayout(size);
controller->SetText(textMulti);
controller->Relayout(size);