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
Support paragraph tag <p> in markup
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
view-model.cpp
diff --git
a/dali-toolkit/internal/text/rendering/view-model.cpp
b/dali-toolkit/internal/text/rendering/view-model.cpp
index
5e014df
..
0b26e4e
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/
dali-toolkit/internal/text/rendering/view-model.cpp
@@
-23,8
+23,8
@@
#include <memory.h>
// INTERNAL INCLUDES
#include <memory.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/text/line-run.h>
#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
#include <dali-toolkit/internal/text/glyph-metrics-helper.h>
+#include <dali-toolkit/internal/text/line-run.h>
namespace Dali
{
namespace Dali
{
@@
-270,7
+270,7
@@
Length ViewModel::GetNumberOfUnderlineRuns() const
return mModel->GetNumberOfUnderlineRuns();
}
return mModel->GetNumberOfUnderlineRuns();
}
-void ViewModel::GetUnderlineRuns(GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
+void ViewModel::GetUnderlineRuns(
Underlined
GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns) const
{
mModel->GetUnderlineRuns(underlineRuns, index, numberOfRuns);
}
{
mModel->GetUnderlineRuns(underlineRuns, index, numberOfRuns);
}
@@
-645,6
+645,16
@@
void ViewModel::GetStrikethroughRuns(StrikethroughGlyphRun* strikethroughRuns, S
mModel->GetStrikethroughRuns(strikethroughRuns, index, numberOfRuns);
}
mModel->GetStrikethroughRuns(strikethroughRuns, index, numberOfRuns);
}
+Length ViewModel::GetNumberOfBoundedParagraphRuns() const
+{
+ return mModel->GetNumberOfBoundedParagraphRuns();
+}
+
+const Vector<BoundedParagraphRun>& ViewModel::GetBoundedParagraphRuns() const
+{
+ return mModel->GetBoundedParagraphRuns();
+}
+
} // namespace Text
} // namespace Toolkit
} // namespace Text
} // namespace Toolkit