From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 27 Jul 2017 08:56:30 +0000 (+0000)
Subject: Merge "Note that some Text propeties in devel api can't be changed" into devel/master
X-Git-Tag: dali_1.2.50~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=24d391fe222bd0fd5910e3b3481124fa23b796be;hp=-c

Merge "Note that some Text propeties in devel api can't be changed" into devel/master
---

24d391fe222bd0fd5910e3b3481124fa23b796be
diff --combined dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
index 50f6af5,f2fa947..3560363
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
@@@ -78,30 -78,35 +78,35 @@@ namespace Propert
        /**
         * @brief name "smoothScroll", type bool
         * @details Enable or disable the smooth scroll animation
+        * @note This property is currently being used for some applications, so it can't be changed.
         */
        SMOOTH_SCROLL = INPUT_OUTLINE + 1,
  
        /**
         * @brief name "smoothScrollDuration", type float
         * @details Sets the duration of smooth scroll animation
+        * @note This property is currently being used for some applications, so it can't be changed.
         */
        SMOOTH_SCROLL_DURATION,
  
        /**
         * @brief name "enableScrollBar", type bool
         * @details Enable or disable the scroll bar
+        * @note This property is currently being used for some applications, so it can't be changed.
         */
        ENABLE_SCROLL_BAR,
  
        /**
         * @brief name "scrollBarShowDuration", type float
         * @details Sets the duration of scroll bar to show
+        * @note This property is currently being used for some applications, so it can't be changed.
         */
        SCROLL_BAR_SHOW_DURATION,
  
        /**
         * @brief name "scrollBarFadeDuration", type float
         * @details Sets the duration of scroll bar to fade out
+        * @note This property is currently being used for some applications, so it can't be changed.
         */
        SCROLL_BAR_FADE_DURATION,
  
@@@ -145,15 -150,14 +150,15 @@@
         * @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 );
@@@ -161,13 -165,7 +166,13 @@@
         *
         * @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
  
diff --combined dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
index 9ff0b2c,35c2d02..bc199ad
--- 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 +86,7 @@@ namespace Propert
         * @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,
@@@ -111,15 -112,14 +112,15 @@@
         * @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;
         *
         *   field.SetProperty( DevelTextField::Property::PLACEHOLDER, propertyMap );