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 character glyph index before using cached Font" 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
43a7cf3
..
e9d99f1
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.h
+++ b/
dali-toolkit/internal/text/text-controller-impl.h
@@
-104,6
+104,7
@@
struct EventData
DecoratorPtr mDecorator; ///< Pointer to the decorator.
ImfManager mImfManager; ///< The Input Method Framework Manager.
DecoratorPtr mDecorator; ///< Pointer to the decorator.
ImfManager mImfManager; ///< The Input Method Framework Manager.
+ std::string mPlaceholderText; ///< The text to display when the TextField is empty.
std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus.
std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
Vector4 mPlaceholderTextColor; ///< The in/active placeholder text color.
std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus.
std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive.
Vector4 mPlaceholderTextColor; ///< The in/active placeholder text color.
@@
-316,7
+317,8
@@
struct Controller::Impl
mIsAutoScrollEnabled( false ),
mAutoScrollDirectionRTL( false ),
mUnderlineSetByString( false ),
mIsAutoScrollEnabled( false ),
mAutoScrollDirectionRTL( false ),
mUnderlineSetByString( false ),
- mShadowSetByString( false )
+ mShadowSetByString( false ),
+ mFontStyleSetByString( false )
{
mModel = Model::New();
{
mModel = Model::New();
@@
-382,10
+384,9
@@
struct Controller::Impl
*/
bool IsPlaceholderAvailable() const
{
*/
bool IsPlaceholderAvailable() const
{
- return ( mEventData &&
- ( !mEventData->mPlaceholderTextInactive.empty() ||
- !mEventData->mPlaceholderTextActive.empty() )
- );
+ return ( mEventData && ( !mEventData->mPlaceholderText.empty() ||
+ !mEventData->mPlaceholderTextInactive.empty() ||
+ !mEventData->mPlaceholderTextActive.empty() ) );
}
bool IsShowingPlaceholderText() const
}
bool IsShowingPlaceholderText() const
@@
-398,7
+399,8
@@
struct Controller::Impl
*/
bool IsFocusedPlaceholderAvailable() const
{
*/
bool IsFocusedPlaceholderAvailable() const
{
- return ( mEventData && !mEventData->mPlaceholderTextActive.empty() );
+ return ( mEventData && ( !mEventData->mPlaceholderTextActive.empty() ||
+ !mEventData->mPlaceholderText.empty() ) );
}
bool IsShowingRealText() const
}
bool IsShowingRealText() const
@@
-725,6
+727,7
@@
public:
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
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
+ bool mFontStyleSetByString:1; ///< Set when font style is set by string (legacy) instead of map
};
} // namespace Text
};
} // namespace Text