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
Fix prevent issues
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
visual-model-impl.cpp
diff --git
a/dali-toolkit/internal/text/visual-model-impl.cpp
b/dali-toolkit/internal/text/visual-model-impl.cpp
index
bb7cdde
..
561beee
100644
(file)
--- a/
dali-toolkit/internal/text/visual-model-impl.cpp
+++ b/
dali-toolkit/internal/text/visual-model-impl.cpp
@@
-149,13
+149,13
@@
void VisualModel::GetNumberOfLines( GlyphIndex glyphIndex,
{
const LineRun& line = *it;
{
const LineRun& line = *it;
- if( ( line.glyph
Index + line
.numberOfGlyphs > glyphIndex ) &&
- ( lastGlyphIndex > line.glyphIndex ) )
+ if( ( line.glyph
Run.glyphIndex + line.glyphRun
.numberOfGlyphs > glyphIndex ) &&
+ ( lastGlyphIndex > line.glyph
Run.glyph
Index ) )
{
firstLineFound = true;
++numberOfLines;
}
{
firstLineFound = true;
++numberOfLines;
}
- else if( lastGlyphIndex <= line.glyphIndex )
+ else if( lastGlyphIndex <= line.glyph
Run.glyph
Index )
{
// nothing else to do.
break;
{
// nothing else to do.
break;
@@
-216,6
+216,15
@@
LineIndex VisualModel::GetLineOfCharacter( CharacterIndex characterIndex )
return index;
}
return index;
}
+void VisualModel::GetUnderlineRuns( GlyphRun* underlineRuns,
+ UnderlineRunIndex index,
+ Length numberOfRuns ) const
+{
+ memcpy( underlineRuns,
+ mUnderlineRuns.Begin() + index,
+ numberOfRuns * sizeof( GlyphRun ) );
+}
+
void VisualModel::SetNaturalSize( const Vector2& size )
{
mNaturalSize = size;
void VisualModel::SetNaturalSize( const Vector2& size )
{
mNaturalSize = size;