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
Markup processor.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.h
diff --git
a/dali-toolkit/internal/text/text-controller-impl.h
b/dali-toolkit/internal/text/text-controller-impl.h
index
927352c
..
190549c
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-182,8
+182,8
@@
struct FontDefaults
FontDefaults()
: mFontDescription(),
mFontStyle(),
FontDefaults()
: mFontDescription(),
mFontStyle(),
- mDefaultPointSize(
0.0f
),
- mFontId(
0u
)
+ mDefaultPointSize(
0.f
),
+ mFontId(
0u
)
{
// Initially use the default platform font
TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
{
// Initially use the default platform font
TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
@@
-226,7
+226,8
@@
struct Controller::Impl
mOperationsPending( NO_OPERATION ),
mMaximumNumberOfCharacters( 50u ),
mRecalculateNaturalSize( true ),
mOperationsPending( NO_OPERATION ),
mMaximumNumberOfCharacters( 50u ),
mRecalculateNaturalSize( true ),
- mUserDefinedFontFamily( false )
+ mUserDefinedFontFamily( false ),
+ mMarkupProcessorEnabled( false )
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
{
mLogicalModel = LogicalModel::New();
mVisualModel = VisualModel::New();
@@
-512,7
+513,7
@@
struct Controller::Impl
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
bool mUserDefinedFontFamily:1; ///< Whether the Font family was set by the user instead of being left as sytem default.
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
bool mUserDefinedFontFamily:1; ///< Whether the Font family was set by the user instead of being left as sytem default.
-
+ bool mMarkupProcessorEnabled:1; ///< Whether the mark-up procesor is enabled.
};
} // namespace Text
};
} // namespace Text