X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-field-devel.h;h=dea5ded19dc7ef3dfab3d48f6be40ee835ef2b6d;hb=1498b458e65cce375898c232cfa87c831b1f1c6b;hp=21e2d5624f8a6e60ae69a1dad97da9681b47e3fd;hpb=66521be1c480614a631f58d77be161e1c247e35f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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
new mode 100755
index 21e2d56..dea5ded
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_FIELD_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 <dali/devel-api/adaptor-framework/input-method-context.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
@@ -32,7 +34,7 @@ namespace DevelTextField
 
 namespace Property
 {
-  enum Type
+  enum
   {
       RENDERING_BACKEND = Dali::Toolkit::TextField::Property::RENDERING_BACKEND,
       TEXT = Dali::Toolkit::TextField::Property::TEXT,
@@ -81,23 +83,35 @@ namespace Property
       INPUT_EMBOSS = Dali::Toolkit::TextField::Property::INPUT_EMBOSS,
       OUTLINE = Dali::Toolkit::TextField::Property::OUTLINE,
       INPUT_OUTLINE = Dali::Toolkit::TextField::Property::INPUT_OUTLINE,
+      HIDDEN_INPUT_SETTINGS = Dali::Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS,
+      PIXEL_SIZE = Dali::Toolkit::TextField::Property::PIXEL_SIZE,
+      ENABLE_SELECTION = Dali::Toolkit::TextField::Property::ENABLE_SELECTION,
+      PLACEHOLDER = Dali::Toolkit::TextField::Property::PLACEHOLDER,
+      ELLIPSIS = Dali::Toolkit::TextField::Property::ELLIPSIS,
 
       /**
-       * @brief Hides the input characters and instead shows a default character for password or pin entry.
-       * @details name "hiddenInputSettings", type map.
-       * @note Optional.
-       * @see HiddenInput
+       * @brief Enables Text selection using Shift key.
+       * @details Name "enableShiftSelection", type Property::BOOLEAN.
        */
-      HIDDEN_INPUT_SETTINGS = INPUT_OUTLINE + 1,
+      ENABLE_SHIFT_SELECTION = ELLIPSIS + 1,
 
       /**
-       * @brief The size of font in pixels.
-       * @details name "pixelSize", type float
+       * @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.
        */
-      PIXEL_SIZE = INPUT_OUTLINE + 2,
+      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_TOOLKIT_API InputMethodContext GetInputMethodContext( TextField textField );
+
 } // namespace DevelText
 
 } // namespace Toolkit