Merge "Note that some Text propeties in devel api can't be changed" into devel/master
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / text-controls / text-editor-devel.h
index f2fa947..3560363 100644 (file)
@@ -150,14 +150,15 @@ namespace Property
        * @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" );
+       *   fontStyleMap.Insert( "weight", "bold" );
+       *   fontStyleMap.Insert( "width", "condensed" );
+       *   fontStyleMap.Insert( "slant", "italic" );
        *   propertyMap["placeholderFontStyle"] = fontStyleMap;
        *
        *   editor.SetProperty( DevelTextEditor::Property::PLACEHOLDER, propertyMap );
@@ -165,7 +166,13 @@ namespace Property
        *
        * @details name "placeholder", type MAP
        */
-      PLACEHOLDER
+      PLACEHOLDER,
+
+      /**
+       * @brief line wrap mode when the text lines over layout width.
+       * @details name "lineWrapMode", type string.
+       */
+      LINE_WRAP_MODE
   };
 } // namespace Property