Fixed GetHeightForWidth for text label

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-field-impl.h

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 4e18eb2..b6b11b1 100644 (file)
--- 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.
@@ -53,11 +53,6 @@ public:
    */
   static Toolkit::TextField New();
 
-  /**
-   * @copydoc Dali::Toollkit::TextField::SetRenderer()
-   */
-  void SetRenderer( Text::RendererPtr renderer );
-
   // Properties
 
   /**
@@ -84,6 +79,16 @@ 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 );
@@ -94,6 +99,11 @@ private: // From Control
   virtual void OnTap( const TapGesture& tap );
 
   /**
+   * TODO - Fix TapGestureDetector to support single and double tap
+   */
+  void OnDoubleTap( Actor actor, const TapGesture& tap );
+
+  /**
    * @copydoc Text::ControlInterface::RequestTextRelayout()
    */
   virtual void RequestTextRelayout();
@@ -121,26 +131,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);
 }
@@ -149,4 +163,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__