X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=4bec09d59dc1e482e4cab2b8364d90445dcf3ad3;hp=b6b11b1ffbee325d69abc496fea1c5428392bba7;hb=6f62c2545af5b288bf447c380ccfb562cc7a4370;hpb=a44ea1b60d12c879dacaa5f78b6c042b59ed6c2c

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index b6b11b1..4bec09d 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -21,9 +21,11 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
-#include <dali-toolkit/public-api/text/decorator/text-decorator.h>
-#include <dali-toolkit/public-api/text/text-control-interface.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/internal/text/clipping/text-clipper.h>
+#include <dali-toolkit/internal/text/decorator/text-decorator.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
+#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {
@@ -41,13 +43,6 @@ class TextField : public Control, public Text::ControlInterface
 {
 public:
 
-  // Properties
-  enum
-  {
-    TEXTFIELD_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
-    TEXTFIELD_PROPERTY_END_INDEX = TEXTFIELD_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
-  };
-
   /**
    * @copydoc Dali::Toollkit::TextField::New()
    */
@@ -56,7 +51,8 @@ public:
   // Properties
 
   /**
-   * Called when a property of an object of this type is set.
+   * @brief Called when a property of an object of this type is set.
+   *
    * @param[in] object The object whose property is set.
    * @param[in] index The property index.
    * @param[in] value The new property value.
@@ -64,7 +60,8 @@ public:
   static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
 
   /**
-   * Called to retrieve a property of an object of this type.
+   * @brief Called to retrieve a property of an object of this type.
+   *
    * @param[in] object The object whose property is to be retrieved.
    * @param[in] index The property index.
    * @return The current value of the property.
@@ -79,6 +76,11 @@ private: // From Control
   virtual void OnInitialize();
 
   /**
+   * @copydoc Control::OnStyleChange()
+   */
+  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
+
+  /**
    * @copydoc Control::GetNaturalSize()
    */
   virtual Vector3 GetNaturalSize();
@@ -94,14 +96,24 @@ private: // From Control
   virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
   /**
-   * @copydoc Control::OnTap()
+   * @copydoc Control::OnKeyInputFocusGained()
+   */
+  virtual void OnKeyInputFocusGained();
+
+  /**
+   * @copydoc Control::OnKeyInputFocusLost()
+   */
+  virtual void OnKeyInputFocusLost();
+
+  /**
+   * Received for single & double taps
    */
   virtual void OnTap( const TapGesture& tap );
 
   /**
-   * TODO - Fix TapGestureDetector to support single and double tap
+   * @copydoc Dali::CustomActorImpl::OnKeyEvent(const KeyEvent&)
    */
-  void OnDoubleTap( Actor actor, const TapGesture& tap );
+  virtual bool OnKeyEvent(const KeyEvent& event);
 
   /**
    * @copydoc Text::ControlInterface::RequestTextRelayout()
@@ -111,6 +123,21 @@ private: // From Control
 private: // Implementation
 
   /**
+   * @brief Enable or disable clipping.
+   *
+   * @param[in] clipping True if clipping should be enabled.
+   * @param[in] size The area to clip within.
+   */
+  void EnableClipping( bool clipping, const Vector2& size );
+
+  /**
+   * @brief Callback when keyboard is shown/hidden.
+   *
+   * @param[in] keyboardShown True if keyboard is shown.
+   */
+  void KeyboardStatusChanged( bool keyboardShown );
+
+  /**
    * Construct a new TextField.
    */
   TextField();
@@ -131,10 +158,12 @@ private: // Data
   Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
   Text::DecoratorPtr mDecorator;
+  Text::ClipperPtr mClipper; ///< For EXCEED_POLICY_CLIP
 
-  TapGestureDetector mDoubleTapDetector;
+  RenderableActor mRenderableActor;
 
-  unsigned int mRenderingBackend;
+  int mRenderingBackend;
+  int mExceedPolicy;
 };
 
 } // namespace Internal