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 "Initialise all members in TextVerticalScroller" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
markup-processor.h
diff --git
a/dali-toolkit/internal/text/markup-processor.h
b/dali-toolkit/internal/text/markup-processor.h
index
966622e
..
0c43300
100644
(file)
--- a/
dali-toolkit/internal/text/markup-processor.h
+++ b/
dali-toolkit/internal/text/markup-processor.h
@@
-24,6
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/color-run.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/color-run.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
namespace Dali
{
namespace Dali
{
@@
-39,14
+40,17
@@
namespace Text
*/
struct MarkupProcessData
{
*/
struct MarkupProcessData
{
- MarkupProcessData( Vector<ColorRun>& colorRuns )
+MarkupProcessData( Vector<ColorRun>& colorRuns,
+ Vector<FontDescriptionRun>& fontRuns )
: colorRuns( colorRuns ),
: colorRuns( colorRuns ),
+ fontRuns( fontRuns ),
markupProcessedText()
{}
markupProcessedText()
{}
- Vector<ColorRun>& colorRuns;
+ Vector<ColorRun>& colorRuns; ///< The color runs.
+ Vector<FontDescriptionRun>& fontRuns; ///< The font description runs.
- std::string markupProcessedText;
+ std::string markupProcessedText;
///< The mark-up string.
};
/**
};
/**