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
Changes after TouchedSignal changes
[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
old mode 100644
(file)
new mode 100755
(executable)
index
966622e
..
de66e7f
--- a/
dali-toolkit/internal/text/markup-processor.h
+++ b/
dali-toolkit/internal/text/markup-processor.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__
-#define
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__
+#ifndef
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
+#define
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,6
+24,8
@@
// 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/embedded-item.h>
+#include <dali-toolkit/internal/text/font-description-run.h>
namespace Dali
{
namespace Dali
{
@@
-39,14
+41,19
@@
namespace Text
*/
struct MarkupProcessData
{
*/
struct MarkupProcessData
{
- MarkupProcessData( Vector<ColorRun>& colorRuns )
+MarkupProcessData( Vector<ColorRun>& colorRuns,
+ Vector<FontDescriptionRun>& fontRuns,
+ Vector<EmbeddedItem>& items )
: colorRuns( colorRuns ),
: colorRuns( colorRuns ),
+ fontRuns( fontRuns ),
+ items(items),
markupProcessedText()
{}
markupProcessedText()
{}
- Vector<ColorRun>& colorRuns;
-
- std::string markupProcessedText;
+ Vector<ColorRun>& colorRuns; ///< The color runs.
+ Vector<FontDescriptionRun>& fontRuns; ///< The font description runs.
+ Vector<EmbeddedItem>& items; ///< The embedded items.
+ std::string markupProcessedText; ///< The mark-up string.
};
/**
};
/**
@@
-63,4
+70,4
@@
void ProcessMarkupString( const std::string& markupString, MarkupProcessData& ma
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H__
+#endif //
DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_H