-#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.
#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>
namespace Dali
/**
* @brief A control which renders a short text string.
*/
-class TextField : public Control
+class TextField : public Control, public Text::ControlInterface
{
public:
*/
static Toolkit::TextField New();
- /**
- * @copydoc Dali::Toollkit::TextField::SetRenderer()
- */
- void SetRenderer( Text::RendererPtr renderer );
-
// Properties
/**
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.
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);
}
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#endif // __DALI_TOOLKIT_INTERNAL_TEXT_FIELD_H__