Add U0 case to Utf8ToUtf32

[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 e9d99f1..054f4a7 100644 (file)
--- a/dali-toolkit/internal/text/text-controller-impl.h
+++ b/dali-toolkit/internal/text/text-controller-impl.h
@@ -39,6 +39,7 @@ namespace Text
 
 //Forward declarations
 struct CursorInfo;
+struct FontDefaults;
 
 struct Event
 {
@@ -104,7 +105,7 @@ struct EventData
 
   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.
+  FontDefaults*      mPlaceholderFont;         ///< The placeholder default font.
   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.
@@ -155,6 +156,7 @@ struct EventData
   bool mUpdateInputStyle                : 1;   ///< Whether to update the input style after moving the cursor.
   bool mPasswordInput                   : 1;   ///< True if password input is enabled.
   bool mCheckScrollAmount               : 1;   ///< Whether to check scrolled amount after updating the position
+  bool mIsPlaceholderPixelSize          : 1;   ///< True if the placeholder font size is set as pixel size.
 };
 
 struct ModifyEvent
@@ -384,9 +386,10 @@ struct Controller::Impl
    */
   bool IsPlaceholderAvailable() const
   {
-    return ( mEventData && ( !mEventData->mPlaceholderText.empty() ||
-                             !mEventData->mPlaceholderTextInactive.empty() ||
-                             !mEventData->mPlaceholderTextActive.empty() ) );
+    return ( mEventData &&
+             ( !mEventData->mPlaceholderTextInactive.empty() ||
+               !mEventData->mPlaceholderTextActive.empty() )
+           );
   }
 
   bool IsShowingPlaceholderText() const
@@ -399,8 +402,7 @@ struct Controller::Impl
    */
   bool IsFocusedPlaceholderAvailable() const
   {
-    return ( mEventData && ( !mEventData->mPlaceholderTextActive.empty() ||
-                             !mEventData->mPlaceholderText.empty() ) );
+    return ( mEventData && !mEventData->mPlaceholderTextActive.empty() );
   }
 
   bool IsShowingRealText() const