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 "Fix: The last line of the text overlaps with the text-editor's border/edge...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-LogicalModel.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
index
8515172
..
a95b707
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
@@
-119,7
+119,9
@@
bool CreateParagraphTest( const CreateParagraphData& data )
textModel,
metrics,
false,
textModel,
metrics,
false,
- LineWrap::WORD );
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END );
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
@@
-182,7
+184,9
@@
bool FindParagraphTest( const FindParagraphData& data )
textModel,
metrics,
false,
textModel,
metrics,
false,
- LineWrap::WORD );
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END );
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
@@
-234,7
+238,9
@@
bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data
textModel,
metrics,
false,
textModel,
metrics,
false,
- LineWrap::WORD );
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END );
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
@@
-281,7
+287,9
@@
bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
textModel,
metrics,
false,
textModel,
metrics,
false,
- LineWrap::WORD );
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END );
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
@@
-345,7
+353,9
@@
bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
textModel,
metrics,
false,
textModel,
metrics,
false,
- LineWrap::WORD );
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END );
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;
LogicalModelPtr logicalModel = textModel->mLogicalModel;
VisualModelPtr visualModel = textModel->mVisualModel;