X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-editor-devel.h;h=7bed333df07113c4a3f455b8d907e3d95ac87f90;hb=141d88c741ff0aef9aa74259f116fc17023e043a;hp=e09207cac446c8ae865012a7cf7f7ef8e062404f;hpb=d26f555fd84d43b0a3e650c66a0e626e841dd9c6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 old mode 100644 new mode 100755 index e09207c..7bed333 --- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_EDITOR_DEVEL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,8 @@ * limitations under the License. * */ +// EXTERNAL INCLUDES +#include // INTERNAL INCLUDES #include @@ -74,118 +76,52 @@ namespace Property INPUT_EMBOSS = Dali::Toolkit::TextEditor::Property::INPUT_EMBOSS, OUTLINE = Dali::Toolkit::TextEditor::Property::OUTLINE, INPUT_OUTLINE = Dali::Toolkit::TextEditor::Property::INPUT_OUTLINE, - - /** - * @brief name "smoothScroll", type bool - * @details Enable or disable the smooth scroll animation - */ - SMOOTH_SCROLL = INPUT_OUTLINE + 1, - - /** - * @brief name "smoothScrollDuration", type float - * @details Sets the duration of smooth scroll animation - */ - SMOOTH_SCROLL_DURATION, - - /** - * @brief name "enableScrollBar", type bool - * @details Enable or disable the scroll bar - */ - ENABLE_SCROLL_BAR, - - /** - * @brief name "scrollBarShowDuration", type float - * @details Sets the duration of scroll bar to show - */ - SCROLL_BAR_SHOW_DURATION, - - /** - * @brief name "scrollBarFadeDuration", type float - * @details Sets the duration of scroll bar to fade out - */ - SCROLL_BAR_FADE_DURATION, - - /** - * @brief The size of font in pixels. - * - * Conversion from Point size to Pixel size : - * Pixel size = Point size * DPI / 72 - * @details name "pixelSize", type float - */ - PIXEL_SIZE, - - /** - * @brief The line count of text. - * @details name "lineCount", type int - * @note this property is read-only. - */ - LINE_COUNT, + SMOOTH_SCROLL = Dali::Toolkit::TextEditor::Property::SMOOTH_SCROLL, + SMOOTH_SCROLL_DURATION = Dali::Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION, + ENABLE_SCROLL_BAR = Dali::Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR, + SCROLL_BAR_SHOW_DURATION = Dali::Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION, + SCROLL_BAR_FADE_DURATION = Dali::Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION, + PIXEL_SIZE = Dali::Toolkit::TextEditor::Property::PIXEL_SIZE, + LINE_COUNT = Dali::Toolkit::TextEditor::Property::LINE_COUNT, + ENABLE_SELECTION = Dali::Toolkit::TextEditor::Property::ENABLE_SELECTION, + PLACEHOLDER = Dali::Toolkit::TextEditor::Property::PLACEHOLDER, + LINE_WRAP_MODE = Dali::Toolkit::TextEditor::Property::LINE_WRAP_MODE, /** * @brief The text to display when the TextEditor is empty and inactive. - * @details name "placeholderText", type string + * @details Name "placeholderText", type Property::STRING. */ PLACEHOLDER_TEXT, /** * @brief The placeholder-text color. - * @details name "placeholderTextColor", type vector4 + * @details Name "placeholderTextColor", type Property::VECTOR4. */ PLACEHOLDER_TEXT_COLOR, /** - * @brief Enables Text selection, such as the cursor, handle, clipboard, and highlight color. - * @details name "enableSelection", type bool + * @brief Enables Text selection using Shift key. + * @details Name "enableShiftSelection", type Property::BOOLEAN. */ - ENABLE_SELECTION, + ENABLE_SHIFT_SELECTION, /** - * @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["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; - * - * editor.SetProperty( DevelTextEditor::Property::PLACEHOLDER, propertyMap ); - * @endcode - * - * @details name "placeholder", type MAP + * @brief Enables the grab handles for text selection. + * @details Name "enableGrabHandle", type Property::BOOLEAN. + * @note The default value is true, which means the grab handles are enabled by default. */ - PLACEHOLDER + ENABLE_GRAB_HANDLE }; -} // namespace Property -namespace Scroll -{ - enum Type - { - STARTED, ///< Scrolling is started. - FINISHED ///< Scrolling is finished. - }; -} // namespace Scroll - -typedef Signal< void ( TextEditor, Scroll::Type ) > ScrollStateChangedSignalType; +} // namespace Property /** - * @brief This signal is emitted when TextEditor scrolling is started or finished. + * @brief Return the input method context of TextEditor. * - * A callback of the following type may be connected: - * @code - * void YourCallbackName( ScrollState::Type type ); - * @endcode - * type: Whether the scrolling is started or finished. - * @return The signal to connect to + * @param[in] textEditor The instance of TextEditor. + * @return InputMethodContext instance. */ -DALI_IMPORT_API ScrollStateChangedSignalType& ScrollStateChangedSignal( TextEditor textEditor ); +DALI_TOOLKIT_API InputMethodContext GetInputMethodContext( TextEditor textEditor ); } // namespace DevelTextEditor