X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-field-devel.h;h=bc199ad247984064b950a1f991f7e84e4e8d962d;hp=f98ea63cd91e80d519dad8017bb63cd9e461e8a7;hb=24d391fe222bd0fd5910e3b3481124fa23b796be;hpb=c2747d79f281a82cf9c2cbec30f0f29965d1bde6

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
index f98ea63..bc199ad 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
@@ -86,6 +86,7 @@ namespace Property
        * @brief Hides the input characters and instead shows a default character for password or pin entry.
        * @details name "hiddenInputSettings", type map.
        * @note Optional.
+       *       This property is currently being used for some applications, so it can't be changed.
        * @see HiddenInput
        */
       HIDDEN_INPUT_SETTINGS = INPUT_OUTLINE + 1,
@@ -103,7 +104,31 @@ namespace Property
        * @brief Enables Text selection, such as the cursor, handle, clipboard, and highlight color.
        * @details name "enableSelection", type bool
        */
-      ENABLE_SELECTION = INPUT_OUTLINE + 3
+      ENABLE_SELECTION = INPUT_OUTLINE + 3,
+
+      /**
+       * @brief Sets the placeholder : text, color, font family, font style, point size, and pixel size.
+       *
+       * @code
+       *   Property::Map propertyMap;
+       *   propertyMap["placeholderText"] = "Setting Placeholder Text";
+       *   propertyMap["placeholderTextFocused"] = "Setting Placeholder Text Focused";
+       *   propertyMap["placeholderColor"] = Color::RED;
+       *   propertyMap["placeholderFontFamily"] = "Arial";
+       *   propertyMap["placeholderPointSize"] = 12.0f;
+       *
+       *   Property::Map fontStyleMap;
+       *   fontStyleMap.Insert( "weight", "bold" );
+       *   fontStyleMap.Insert( "width", "condensed" );
+       *   fontStyleMap.Insert( "slant", "italic" );
+       *   propertyMap["placeholderFontStyle"] = fontStyleMap;
+       *
+       *   field.SetProperty( DevelTextField::Property::PLACEHOLDER, propertyMap );
+       * @endcode
+       *
+       * @details name "placeholder", type MAP
+       */
+      PLACEHOLDER = INPUT_OUTLINE + 4
   };
 } // namespace Property