X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-controls%2Ftext-editor.h;h=f633f4558797df94658fc828d25207b0717e4b8c;hp=659e3394c68f03eeecda601825b8ce282e47147a;hb=4c75bf7cad5d505c34f9bcb247b5fa9806115349;hpb=f090b040537e2a5a60a6dc80009ade9b72d37d4b diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index 659e339..f633f45 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -117,8 +117,9 @@ public: /** * @brief The text horizontal alignment. - * @details Name "horizontalAlignment", type Property::STRING. + * @details Name "horizontalAlignment", type Property::STRING or type HorizontalAlignment::Type (Property::INTEGER) * Values "BEGIN" "CENTER" "END". + * @note Return type is Property::STRING * @SINCE_1_1.37 */ HORIZONTAL_ALIGNMENT, @@ -300,9 +301,7 @@ public: INPUT_LINE_SPACING, /** - * @brief The default underline parameters. - * @details Name "underline", type Property::MAP. - * @SINCE_1_2.13 + * @copydoc Dali::Toolkit::TextLabel::Property::UNDERLINE */ UNDERLINE, @@ -314,9 +313,7 @@ public: INPUT_UNDERLINE, /** - * @brief The default shadow parameters. - * @details Name "shadow", type Property::MAP. - * @SINCE_1_2.13 + * @copydoc Dali::Toolkit::TextLabel::Property::SHADOW */ SHADOW, @@ -342,9 +339,7 @@ public: INPUT_EMBOSS, /** - * @brief The default outline parameters. - * @details Name "outline", type Property::MAP. - * @SINCE_1_2.13 + * @copydoc Dali::Toolkit::TextLabel::Property::OUTLINE */ OUTLINE, @@ -440,9 +435,12 @@ public: PLACEHOLDER, /** - * @brief line wrap mode when the text lines over layout width. - * @details Name "lineWrapMode", type Property::STRING. + * @brief Line wrap mode when text lines are greater than the layout width. + * @details Name "lineWrapMode", type Text::LineWrap::Mode (Text::Property::INTEGER) or Property::STRING. * @SINCE_1_2.60 + * @note Default is Text::LineWrap::WORD. + * @note Return type is Text::LineWrap::Mode (Text::Property::INTEGER). + * @see Text::LineWrap */ LINE_WRAP_MODE, };