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 "Add ECORE_IMF_CALLBACK_SELECTION_SET to IMFContext" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-view.cpp
diff --git
a/dali-toolkit/internal/text/text-view.cpp
b/dali-toolkit/internal/text/text-view.cpp
index
697dc04
..
9c067de
100644
(file)
--- a/
dali-toolkit/internal/text/text-view.cpp
+++ b/
dali-toolkit/internal/text/text-view.cpp
@@
-114,7
+114,6
@@
Length View::GetGlyphs(GlyphInfo* glyphs,
float calculatedAdvance = 0.f;
const Character* textBuffer = mImpl->mLogicalModel->mText.Begin();
float calculatedAdvance = 0.f;
const Character* textBuffer = mImpl->mLogicalModel->mText.Begin();
-
if(mImpl->mVisualModel)
{
// Get the character-spacing runs.
if(mImpl->mVisualModel)
{
// Get the character-spacing runs.
@@
-125,7
+124,7
@@
Length View::GetGlyphs(GlyphInfo* glyphs,
//Reset indices of ElidedGlyphs
mImpl->mVisualModel->SetStartIndexOfElidedGlyphs(0u);
//Reset indices of ElidedGlyphs
mImpl->mVisualModel->SetStartIndexOfElidedGlyphs(0u);
- mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(numberOfGlyphs
);
+ mImpl->mVisualModel->SetEndIndexOfElidedGlyphs(numberOfGlyphs
- 1u); // Initialization is the last index of Glyphs
mImpl->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(0u);
mImpl->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(0u);
mImpl->mVisualModel->SetFirstMiddleIndexOfElidedGlyphs(0u);
mImpl->mVisualModel->SetSecondMiddleIndexOfElidedGlyphs(0u);