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 "Check for NULL return value in button-impl.cpp" into devel/master
[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
f317fb3
..
43a7cf3
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-314,7
+314,9
@@
struct Controller::Impl
mMarkupProcessorEnabled( false ),
mClipboardHideEnabled( true ),
mIsAutoScrollEnabled( false ),
mMarkupProcessorEnabled( false ),
mClipboardHideEnabled( true ),
mIsAutoScrollEnabled( false ),
- mAutoScrollDirectionRTL( false )
+ mAutoScrollDirectionRTL( false ),
+ mUnderlineSetByString( false ),
+ mShadowSetByString( false )
{
mModel = Model::New();
{
mModel = Model::New();
@@
-721,6
+723,8
@@
public:
bool mIsAutoScrollEnabled:1; ///< Whether auto text scrolling is enabled.
CharacterDirection mAutoScrollDirectionRTL:1; ///< Direction of auto scrolling, true if rtl
bool mIsAutoScrollEnabled:1; ///< Whether auto text scrolling is enabled.
CharacterDirection mAutoScrollDirectionRTL:1; ///< Direction of auto scrolling, true if rtl
+ bool mUnderlineSetByString:1; ///< Set when underline is set by string (legacy) instead of map
+ bool mShadowSetByString:1; ///< Set when shadow is set by string (legacy) instead of map
};
} // namespace Text
};
} // namespace Text