From b904b864bc3875b6cb0bdfa2ad430d094c140205 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 20 Jul 2017 18:49:47 +0900 Subject: [PATCH 1/1] Note that some Text propeties in devel api can't be changed - Note that these properties are currently being used for some applications. So, they can't be changed. Change-Id: I41470f4563e52ea3e66c9ee9dbcd45cf3b57a26c Signed-off-by: Seoyeon Kim --- dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h | 5 +++++ dali-toolkit/devel-api/controls/text-controls/text-field-devel.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h index e09207c..f2fa947 100644 --- 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 @@ namespace Property /** * @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, 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 b678508..35c2d02 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, -- 2.7.4