projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
895e290
)
Add bidirectional text tct.
40/187640/1
author
minho.sun
<minho.sun@samsung.com>
Mon, 27 Aug 2018 06:01:44 +0000
(15:01 +0900)
committer
minho.sun
<minho.sun@samsung.com>
Mon, 27 Aug 2018 06:01:44 +0000
(15:01 +0900)
Add bidirectional text tct.
For this, made CreateTextModel() can support markup text.
Change-Id: I13ad4025635ba257611875284563bce09d8c6192
Signed-off-by: minho.sun <minho.sun@samsung.com>
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
patch
|
blob
|
history
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
patch
|
blob
|
history
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index
b977ec3
..
7ced8cb
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@
-31,6
+31,7
@@
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
#include <dali-toolkit/internal/text/text-controller-impl.h>
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/markup-processor.h>
namespace Dali
{
namespace Dali
{
@@
-100,31
+101,52
@@
void CreateTextModel( const std::string& text,
Size& layoutSize,
LogicalModelPtr& logicalModel,
VisualModelPtr& visualModel,
Size& layoutSize,
LogicalModelPtr& logicalModel,
VisualModelPtr& visualModel,
- MetricsPtr& metrics )
+ MetricsPtr& metrics,
+ bool markupProcessorEnabled )
{
logicalModel = LogicalModel::New();
visualModel = VisualModel::New();
{
logicalModel = LogicalModel::New();
visualModel = VisualModel::New();
+ MarkupProcessData markupProcessData( logicalModel->mColorRuns,
+ logicalModel->mFontDescriptionRuns );
+
+ Length textSize = 0u;
+ const uint8_t* utf8 = NULL;
+ if( markupProcessorEnabled )
+ {
+ ProcessMarkupString( text, markupProcessData );
+ textSize = markupProcessData.markupProcessedText.size();
+
+ // This is a bit horrible but std::string returns a (signed) char*
+ utf8 = reinterpret_cast<const uint8_t*>( markupProcessData.markupProcessedText.c_str() );
+ }
+ else
+ {
+ textSize = text.size();
+
+ // This is a bit horrible but std::string returns a (signed) char*
+ utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
+ }
+
// 1) Convert to utf32
Vector<Character>& utf32Characters = logicalModel->mText;
// 1) Convert to utf32
Vector<Character>& utf32Characters = logicalModel->mText;
- utf32Characters.Resize( text
.size()
);
+ utf32Characters.Resize( text
Size
);
- const uint32_t numberOfCharacters = ( text.size() == 0) ? 0 :
- Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( text.c_str() ),
- text.size(),
- &utf32Characters[0u] );
- utf32Characters.Resize( numberOfCharacters );
+ // Transform a text array encoded in utf8 into an array encoded in utf32.
+ // It returns the actual number of characters.
+ Length characterCount = Utf8ToUtf32( utf8, textSize, utf32Characters.Begin() );
+ utf32Characters.Resize( characterCount );
// 2) Set the break and paragraph info.
Vector<LineBreakInfo>& lineBreakInfo = logicalModel->mLineBreakInfo;
// 2) Set the break and paragraph info.
Vector<LineBreakInfo>& lineBreakInfo = logicalModel->mLineBreakInfo;
- lineBreakInfo.Resize(
numberOfCharacters
);
+ lineBreakInfo.Resize(
characterCount
);
SetLineBreakInfo( utf32Characters,
0u,
SetLineBreakInfo( utf32Characters,
0u,
-
numberOfCharacters
,
+
characterCount
,
lineBreakInfo );
lineBreakInfo );
- if( 0u ==
numberOfCharacters
)
+ if( 0u ==
characterCount
)
{
// Nothing else to do if the number of characters is zero.
return;
{
// Nothing else to do if the number of characters is zero.
return;
@@
-132,11
+154,11
@@
void CreateTextModel( const std::string& text,
// Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines).
Vector<WordBreakInfo>& wordBreakInfo = logicalModel->mWordBreakInfo;
// Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines).
Vector<WordBreakInfo>& wordBreakInfo = logicalModel->mWordBreakInfo;
- wordBreakInfo.Resize(
numberOfCharacters
);
+ wordBreakInfo.Resize(
characterCount
);
SetWordBreakInfo( utf32Characters,
0u,
SetWordBreakInfo( utf32Characters,
0u,
-
numberOfCharacters
,
+
characterCount
,
wordBreakInfo );
// 3) Set the script info.
wordBreakInfo );
// 3) Set the script info.
@@
-145,7
+167,7
@@
void CreateTextModel( const std::string& text,
Vector<ScriptRun>& scripts = logicalModel->mScriptRuns;
multilanguageSupport.SetScripts( utf32Characters,
0u,
Vector<ScriptRun>& scripts = logicalModel->mScriptRuns;
multilanguageSupport.SetScripts( utf32Characters,
0u,
-
numberOfCharacters
,
+
characterCount
,
scripts );
// 4) Set the font info
scripts );
// 4) Set the font info
@@
-167,7
+189,7
@@
void CreateTextModel( const std::string& text,
fontDescription,
TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
0u,
fontDescription,
TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
0u,
-
numberOfCharacters
,
+
characterCount
,
validFonts );
// 5) Set the bidirectional info per paragraph.
validFonts );
// 5) Set the bidirectional info per paragraph.
@@
-182,12
+204,12
@@
void CreateTextModel( const std::string& text,
scripts,
lineBreakInfo,
0u,
scripts,
lineBreakInfo,
0u,
-
numberOfCharacters
,
+
characterCount
,
bidirectionalInfo );
// Create the paragraph info.
logicalModel->CreateParagraphInfo( 0u,
bidirectionalInfo );
// Create the paragraph info.
logicalModel->CreateParagraphInfo( 0u,
-
numberOfCharacters
);
+
characterCount
);
// 6) Set character directions.
Vector<CharacterDirection>& characterDirections = logicalModel->mCharacterDirections;
// 6) Set character directions.
Vector<CharacterDirection>& characterDirections = logicalModel->mCharacterDirections;
@@
-195,9
+217,9
@@
void CreateTextModel( const std::string& text,
{
// Only set the character directions if there is right to left characters.
GetCharactersDirection( bidirectionalInfo,
{
// Only set the character directions if there is right to left characters.
GetCharactersDirection( bidirectionalInfo,
-
numberOfCharacters
,
+
characterCount
,
0u,
0u,
-
numberOfCharacters
,
+
characterCount
,
characterDirections );
characterDirections );
@@
-206,7
+228,7
@@
void CreateTextModel( const std::string& text,
characterDirections,
bidirectionalInfo,
0u,
characterDirections,
bidirectionalInfo,
0u,
-
numberOfCharacters
,
+
characterCount
,
mirroredUtf32Characters );
}
else
mirroredUtf32Characters );
}
else
@@
-230,15
+252,15
@@
void CreateTextModel( const std::string& text,
validFonts,
0u,
0u,
validFonts,
0u,
0u,
-
numberOfCharacters
,
+
characterCount
,
glyphs,
glyphsToCharactersMap,
charactersPerGlyph,
newParagraphGlyphs );
// Create the 'number of glyphs' per character and the glyph to character conversion tables.
glyphs,
glyphsToCharactersMap,
charactersPerGlyph,
newParagraphGlyphs );
// Create the 'number of glyphs' per character and the glyph to character conversion tables.
- visualModel->CreateGlyphsPerCharacterTable( 0u, 0u,
numberOfCharacters
);
- visualModel->CreateCharacterToGlyphTable( 0u, 0u,
numberOfCharacters
);
+ visualModel->CreateGlyphsPerCharacterTable( 0u, 0u,
characterCount
);
+ visualModel->CreateCharacterToGlyphTable( 0u, 0u,
characterCount
);
const Length numberOfGlyphs = glyphs.Count();
const Length numberOfGlyphs = glyphs.Count();
@@
-291,7
+313,7
@@
void CreateTextModel( const std::string& text,
Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
glyphPositions.Resize( numberOfGlyphs );
Vector<Vector2>& glyphPositions = visualModel->mGlyphPositions;
glyphPositions.Resize( numberOfGlyphs );
- layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( utf32Characters.Begin() + (
numberOfCharacters
- 1u ) ) );
+ layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( utf32Characters.Begin() + (
characterCount
- 1u ) ) );
// The initial glyph and the number of glyphs to layout.
layoutParameters.startGlyphIndex = 0u;
// The initial glyph and the number of glyphs to layout.
layoutParameters.startGlyphIndex = 0u;
@@
-317,7
+339,7
@@
void CreateTextModel( const std::string& text,
bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters.
ReorderLines( bidirectionalInfo,
0u,
bidirectionalLineInfo.Reserve( numberOfLines ); // Reserve because is not known yet how many lines have right to left characters.
ReorderLines( bidirectionalInfo,
0u,
-
numberOfCharacters
,
+
characterCount
,
lines,
bidirectionalLineInfo );
lines,
bidirectionalLineInfo );
@@
-330,7
+352,7
@@
void CreateTextModel( const std::string& text,
// Re-layout the text. Reorder those lines with right to left characters.
layoutEngine.ReLayoutRightToLeftLines( layoutParameters,
0u,
// Re-layout the text. Reorder those lines with right to left characters.
layoutEngine.ReLayoutRightToLeftLines( layoutParameters,
0u,
-
numberOfCharacters
,
+
characterCount
,
glyphPositions );
}
}
glyphPositions );
}
}
@@
-340,7
+362,7
@@
void CreateTextModel( const std::string& text,
float alignmentOffset = 0.f;
layoutEngine.Align( textArea,
0u,
float alignmentOffset = 0.f;
layoutEngine.Align( textArea,
0u,
-
numberOfCharacters
,
+
characterCount
,
Text::HorizontalAlignment::BEGIN,
lines,
alignmentOffset );
Text::HorizontalAlignment::BEGIN,
lines,
alignmentOffset );
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
index
2391cb1
..
8ba7306
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h
@@
-59,6
+59,7
@@
struct LayoutOptions
* @param[out] logicalModel Pointer to a logical text model instance.
* @param[out] visualModel Pointer to a visual text model instance.
* @param[out] metrics Pointer to a wrapper around FontClient used to get metrics.
* @param[out] logicalModel Pointer to a logical text model instance.
* @param[out] visualModel Pointer to a visual text model instance.
* @param[out] metrics Pointer to a wrapper around FontClient used to get metrics.
+ * @param[in] markupProcessorEnabled Enable markup processor to use markup text.
*/
void CreateTextModel( const std::string& text,
const Size& textArea,
*/
void CreateTextModel( const std::string& text,
const Size& textArea,
@@
-67,7
+68,8
@@
void CreateTextModel( const std::string& text,
Size& layoutSize,
LogicalModelPtr& logicalModel,
VisualModelPtr& visualModel,
Size& layoutSize,
LogicalModelPtr& logicalModel,
VisualModelPtr& visualModel,
- MetricsPtr& metrics );
+ MetricsPtr& metrics,
+ bool markupProcessorEnabled );
/**
* @brief Configures the text @p controller similarly to the one configured by the text-label.
/**
* @brief Configures the text @p controller similarly to the one configured by the text-label.
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
index
cb33f00
..
191ead1
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-BidirectionalSupport.cpp
@@
-101,11
+101,12
@@
struct GetMirroredTextData
struct GetCharactersDirectionData
{
struct GetCharactersDirectionData
{
- std::string description; ///< Description of the test.
- std::string text; ///< Input text.
- unsigned int startIndex; ///< The index from where the model is updated.
- unsigned int numberOfCharacters; ///< The number of characters.
- bool* directions; ///< The expected directions.
+ std::string description; ///< Description of the test.
+ std::string text; ///< Input text.
+ unsigned int startIndex; ///< The index from where the model is updated.
+ unsigned int numberOfCharacters; ///< The number of characters.
+ bool* directions; ///< The expected directions.
+ bool markupProcessorEnabled; ///< Enable markup processor to use markup text.
};
bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
};
bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
@@
-127,7
+128,8
@@
bool SetBidirectionalInfoTest( const SetBidirectionalInfoData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Clear the bidirectional paragraph info data.
Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
// 2) Clear the bidirectional paragraph info data.
Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
@@
-233,7
+235,8
@@
bool ReorderLinesTest( const ReorderLinesData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Clear the bidirectional line info data.
uint32_t startRemoveIndex = logicalModel->mBidirectionalLineInfo.Count();
// 2) Clear the bidirectional line info data.
uint32_t startRemoveIndex = logicalModel->mBidirectionalLineInfo.Count();
@@
-358,7
+361,8
@@
bool GetMirroredTextTest( const GetMirroredTextData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Call the GetMirroredText() function for the whole text
Vector<Character> mirroredText;
// 2) Call the GetMirroredText() function for the whole text
Vector<Character> mirroredText;
@@
-432,7
+436,8
@@
bool GetCharactersDirectionTest( const GetCharactersDirectionData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ data.markupProcessorEnabled );
Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = logicalModel->mBidirectionalParagraphInfo;
@@
-930,6
+935,11
@@
int UtcDaliGetCharactersDirection(void)
true, true, true, true, true, true, true, true, true, true,
true, true, false, false, false, false, false };
true, true, true, true, true, true, true, true, true, true,
true, true, false, false, false, false, false };
+ bool directions06[] = {
+ true, true, true, true, true, true, true, true, true, true,
+ false, false, false, false, false, false, false, false, false, false,
+ false, false, false, false, false, false };
+
struct GetCharactersDirectionData data[] =
{
{
struct GetCharactersDirectionData data[] =
{
{
@@
-937,28
+947,32
@@
int UtcDaliGetCharactersDirection(void)
"",
0u,
0u,
"",
0u,
0u,
- directions01
+ directions01,
+ false
},
{
"Left to right characters only",
"Hello world\nhello world demo",
0u,
28u,
},
{
"Left to right characters only",
"Hello world\nhello world demo",
0u,
28u,
- directions02
+ directions02,
+ false
},
{
"Right to left characters only",
"שלום עולם\nשלום עולם",
0u,
19u,
},
{
"Right to left characters only",
"שלום עולם\nשלום עולם",
0u,
19u,
- directions03
+ directions03,
+ false
},
{
"Mix of bidirectional text",
"Hello world\nhello world שלום עולם\nשלום עולם hello world",
0u,
55u,
},
{
"Mix of bidirectional text",
"Hello world\nhello world שלום עולם\nשלום עולם hello world",
0u,
55u,
- directions04
+ directions04,
+ false
},
{
"Mix of bidirectional text. With more paragraphs.",
},
{
"Mix of bidirectional text. With more paragraphs.",
@@
-966,7
+980,8
@@
int UtcDaliGetCharactersDirection(void)
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
0u,
227u,
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
0u,
227u,
- directions05
+ directions05,
+ false
},
{
"Mix of bidirectional text. With more paragraphs. Update first paragraph.",
},
{
"Mix of bidirectional text. With more paragraphs. Update first paragraph.",
@@
-974,7
+989,8
@@
int UtcDaliGetCharactersDirection(void)
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
0u,
17u,
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
0u,
17u,
- directions05
+ directions05,
+ false
},
{
"Mix of bidirectional text. With more paragraphs. Update from character 29",
},
{
"Mix of bidirectional text. With more paragraphs. Update from character 29",
@@
-982,7
+998,8
@@
int UtcDaliGetCharactersDirection(void)
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
29u,
134u,
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
29u,
134u,
- directions05
+ directions05,
+ false
},
{
"Mix of bidirectional text. With more paragraphs. Update from character 163",
},
{
"Mix of bidirectional text. With more paragraphs. Update from character 163",
@@
-990,10
+1007,19
@@
int UtcDaliGetCharactersDirection(void)
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
163u,
35u,
" مرحبا بالعالم שלום עולם hello world hello world\nبالعالم שלום hello world demo עולם\nשלום مرحبا بالعالم עולם hello",
163u,
35u,
- directions05
+ directions05,
+ false
+ },
+ {
+ "Mix of bidirectional text. With brackets and LRM",
+ "שלום עולם ‎(hello)[world]‎",
+ 0u,
+ 26u,
+ directions06,
+ true
}
};
}
};
- const unsigned int numberOfTests =
8
u;
+ const unsigned int numberOfTests =
9
u;
for( unsigned int index = 0u; index < numberOfTests; ++index )
{
for( unsigned int index = 0u; index < numberOfTests; ++index )
{
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
f8df615
..
d43e3e5
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-LogicalModel.cpp
@@
-115,7
+115,8
@@
bool CreateParagraphTest( const CreateParagraphData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Clear the paragraphs.
Vector<ParagraphRun>& paragraphs = logicalModel->mParagraphInfo;
// 2) Clear the paragraphs.
Vector<ParagraphRun>& paragraphs = logicalModel->mParagraphInfo;
@@
-175,7
+176,8
@@
bool FindParagraphTest( const FindParagraphData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Find the paragraphs.
Vector<ParagraphRunIndex> paragraphs;
// 2) Find the paragraphs.
Vector<ParagraphRunIndex> paragraphs;
@@
-224,7
+226,8
@@
bool FetchBidirectionalLineInfoTest( const FetchBidirectionalLineInfoData& data
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
@@
-268,7
+271,8
@@
bool GetLogicalCharacterIndexTest( const GetLogicalCharacterIndexData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
@@
-310,7
+314,8
@@
bool GetLogicalCursorIndexTest( const GetLogicalCursorIndexData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
for( unsigned int index = 0u; index < data.numberOfIndices; ++index )
{
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
index
2a5ae46
..
cba35a3
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Cursor.cpp
@@
-112,7
+112,8
@@
bool GetClosestLineTest( const GetClosestLineData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
@@
-156,7
+157,8
@@
bool GetClosestCursorIndexTest( const GetClosestCursorIndexData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
@@
-204,7
+206,8
@@
bool GetCursorPositionTest( const GetCursorPositionData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
GetCursorPositionParameters parameters;
parameters.visualModel = visualModel;
GetCursorPositionParameters parameters;
parameters.visualModel = visualModel;
@@
-255,7
+258,8
@@
bool FindSelectionIndicesTest( const FindSelectionIndicesData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
for( unsigned int index = 0; index < data.numberOfTests; ++index )
{
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
index
86edead
..
ef83fd7
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
@@
-109,7
+109,8
@@
bool LayoutTextTest( const LayoutTextData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Clear the layout.
Vector<LineRun>& lines = visualModel->mLines;
// 2) Clear the layout.
Vector<LineRun>& lines = visualModel->mLines;
@@
-370,7
+371,8
@@
bool ReLayoutRightToLeftLinesTest( const ReLayoutRightToLeftLinesData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Call the ReLayoutRightToLeftLines() method.
Layout::Engine engine;
// 2) Call the ReLayoutRightToLeftLines() method.
Layout::Engine engine;
@@
-482,7
+484,8
@@
bool AlignTest( const AlignData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// Call the Align method.
Layout::Engine engine;
// Call the Align method.
Layout::Engine engine;
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
index
0b7ca02
..
b5bf653
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
@@
-138,7
+138,8
@@
bool ShapeInfoTest( const ShapeInfoData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
// 2) Clear the model.
// 2) Clear the model.
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
a13b4d8
..
c36fed6
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualModel.cpp
@@
-80,7
+80,8
@@
bool SetGlyphsPerCharacterTest( const SetGlyphsPerCharacterData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
@@
-162,7
+163,8
@@
bool SetCharacterToGlyphTest( const SetCharacterToGlyphData& data )
layoutSize,
logicalModel,
visualModel,
layoutSize,
logicalModel,
visualModel,
- metrics );
+ metrics,
+ false );
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;
Vector<GlyphIndex>& charactersToGlyph = visualModel->mCharactersToGlyph;
Vector<Length>& glyphsPerCharacter = visualModel->mGlyphsPerCharacter;