Merge "Previous model height return problem fixed" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / text-controls / text-field-devel.h

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
old mode 100644 (file)
new mode 100755 (executable)
index 8e73c99..5075358
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
@@ -17,6 +17,8 @@
  * limitations under the License.
  *
  */
+// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/input-method-context.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
@@ -91,10 +93,25 @@ namespace Property
        * @brief Enables Text selection using Shift key.
        * @details Name "enableShiftSelection", type Property::BOOLEAN.
        */
-      ENABLE_SHIFT_SELECTION = ELLIPSIS + 1
+      ENABLE_SHIFT_SELECTION = ELLIPSIS + 1,
+
+      /**
+       * @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.
+       */
+      ENABLE_GRAB_HANDLE = ELLIPSIS + 2
   };
 } // namespace Property
 
+/**
+ * @brief Return the input method context of TextField.
+ *
+ * @param[in] textField The instance of TextField.
+ * @return InputMethodContext instance.
+ */
+DALI_IMPORT_API InputMethodContext GetInputMethodContext( TextField textField );
+
 } // namespace DevelText
 
 } // namespace Toolkit