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 RemoveText code in text-controller.cpp" 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
7333428
..
88c9b42
100644
(file)
--- a/
dali-toolkit/internal/text/text-view.cpp
+++ b/
dali-toolkit/internal/text/text-view.cpp
@@
-94,6
+94,7
@@
Length View::GetNumberOfGlyphs() const
Length View::GetGlyphs( GlyphInfo* glyphs,
Vector2* glyphPositions,
Length View::GetGlyphs( GlyphInfo* glyphs,
Vector2* glyphPositions,
+ float& minLineOffset,
GlyphIndex glyphIndex,
Length numberOfGlyphs ) const
{
GlyphIndex glyphIndex,
Length numberOfGlyphs ) const
{
@@
-157,6
+158,7
@@
Length View::GetGlyphs( GlyphInfo* glyphs,
// Add the alignment offset to the glyph's position.
// Add the alignment offset to the glyph's position.
+ minLineOffset = line->alignmentOffset;
float penY = line->ascender;
for( Length index = 0u; index < numberOfLaidOutGlyphs; ++index )
{
float penY = line->ascender;
for( Length index = 0u; index < numberOfLaidOutGlyphs; ++index )
{
@@
-174,6
+176,7
@@
Length View::GetGlyphs( GlyphInfo* glyphs,
if( lineIndex < numberOfLines )
{
line = lineBuffer + lineIndex;
if( lineIndex < numberOfLines )
{
line = lineBuffer + lineIndex;
+ minLineOffset = std::min( minLineOffset, line->alignmentOffset );
lastGlyphIndexOfLine = line->glyphRun.glyphIndex + line->glyphRun.numberOfGlyphs - 1u;
lastGlyphIndexOfLine = line->glyphRun.glyphIndex + line->glyphRun.numberOfGlyphs - 1u;