X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.h;h=32a7db2517e0d69cf40da4975916175df2378804;hb=eea53605c5acb244aebb72d75bdd9b3a68a9678a;hp=3dbec596753199935647195f9e1847822b90ab72;hpb=8363c13a95006c0cbfe3074e9b601bdaef9537f5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 3dbec59..32a7db2 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
-#define __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__
+#define __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -21,8 +21,10 @@
 // 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-controller.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
 {
@@ -36,27 +38,15 @@ namespace Internal
 /**
  * @brief A control which renders a short text string.
  */
-class TextField : public Control
+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()
    */
   static Toolkit::TextField New();
 
-  /**
-   * @copydoc Dali::Toollkit::TextField::SetRenderer()
-   */
-  void SetRenderer( Text::RendererPtr renderer );
-
   // Properties
 
   /**
@@ -83,17 +73,31 @@ private: // From Control
   virtual void OnInitialize();
 
   /**
+   * @copydoc Control::GetNaturalSize()
+   */
+  virtual Vector3 GetNaturalSize();
+
+  /**
+   * @copydoc Control::GetHeightForWidth()
+   */
+  virtual float GetHeightForWidth( float width );
+
+  /**
    * @copydoc Control::OnInitialize()
    */
   virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
 
-private: // Implementation
+  /**
+   * Received for single & double taps
+   */
+  void OnTap( Actor actor, const TapGesture& tap );
 
   /**
-   * Helper for SetProperty.
-   * @param[in] text The new "text" property value.
+   * @copydoc Text::ControlInterface::RequestTextRelayout()
    */
-  void SetText( const std::string& text );
+  virtual void RequestTextRelayout();
+
+private: // Implementation
 
   /**
    * Construct a new TextField.
@@ -116,26 +120,30 @@ private: // Data
   Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
   Text::DecoratorPtr mDecorator;
+
+  TapGestureDetector mDoubleTapDetector;
+
+  unsigned int mRenderingBackend;
 };
 
 } // namespace Internal
 
 // Helpers for public-api forwarding methods
 
-inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textLabel )
+inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& textField )
 {
-  DALI_ASSERT_ALWAYS(textLabel);
+  DALI_ASSERT_ALWAYS(textField);
 
-  Dali::RefObject& handle = textLabel.GetImplementation();
+  Dali::RefObject& handle = textField.GetImplementation();
 
   return static_cast<Toolkit::Internal::TextField&>(handle);
 }
 
-inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& textLabel )
+inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& textField )
 {
-  DALI_ASSERT_ALWAYS(textLabel);
+  DALI_ASSERT_ALWAYS(textField);
 
-  const Dali::RefObject& handle = textLabel.GetImplementation();
+  const Dali::RefObject& handle = textField.GetImplementation();
 
   return static_cast<const Toolkit::Internal::TextField&>(handle);
 }
@@ -144,4 +152,4 @@ inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& te
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#endif // __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__