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
[dali_2.1.6] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-VisualModel.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
index
11b09f1
..
a88a85d
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-21,7
+21,7
@@
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <toolkit-text-
model
.h>
+#include <toolkit-text-
utils
.h>
using namespace Dali;
using namespace Dali;
@@
-65,8
+65,7
@@
struct SetCharacterToGlyphData
bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
{
// 1) Create the model.
bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
@@
-78,9
+77,16
@@
bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
fontDescriptions,
options,
layoutSize,
fontDescriptions,
options,
layoutSize,
- logicalModel,
- visualModel,
- metrics );
+ textModel,
+ metrics,
+ false,
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END,
+ 0.f );
+
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
@@
-147,8
+153,7
@@
bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data )
{
// 1) Create the model.
bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data )
{
// 1) Create the model.
- LogicalModelPtr logicalModel;
- VisualModelPtr visualModel;
+ ModelPtr textModel;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
MetricsPtr metrics;
Size textArea(100.f, 60.f);
Size layoutSize;
@@
-160,9
+165,16
@@
bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data )
fontDescriptions,
options,
layoutSize,
fontDescriptions,
options,
layoutSize,
- logicalModel,
- visualModel,
- metrics );
+ textModel,
+ metrics,
+ false,
+ LineWrap::WORD,
+ false,
+ Toolkit::DevelText::EllipsisPosition::END,
+ 0.f );
+
+ LogicalModelPtr logicalModel = textModel->mLogicalModel;
+ VisualModelPtr visualModel = textModel->mVisualModel;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;