*
*/
-// EXTERNAL INCLUDES
-#include <dali/devel-api/object/weak-handle.h>
-#include <dali/public-api/common/intrusive-ptr.h>
-
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
-#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/rendering/text-typesetter.h>
#include <dali-toolkit/internal/text/text-controller.h>
namespace Dali
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
- float GetHeightForWidth( float width ) const;
-
- /**
- * @copydoc Visual::Base::GetNaturalSize()
- */
- virtual void SetSize( const Vector2& size );
+ virtual float GetHeightForWidth( float width ) const;
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
* @copydoc Visual::Base::CreatePropertyMap()
virtual void DoSetOffStage( Actor& actor );
/**
- *@copydoc Visual::Base::DoSetProperty
+ * @copydoc Visual::Base::OnSetTransform
*/
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ virtual void OnSetTransform();
+
+private:
/**
- * @copydoc Visual::Base::DoGetProperty
+ * Set the individual property to the given value
+ * @param[in] index The index key used to reference this value within the initial
+ * property map.
+ * @param[in] propertyValue The value to set
*/
- virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+ void SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-private:
+ /**
+ * @brief Creates the text's renderer.
+ */
+ void CreateRenderer();
/**
- * @brief Render view, create and attach actor(s) to this TextView.
- * @todo In a next patch a new text render back-end won't add extra actors.
+ * @brief Destroys the text's renderer.
*/
- void RenderText();
+ void DestroyRenderer();
private:
- Text::ControllerPtr mController; ///< The text's controller.
- WeakHandle<Actor> mSelf;
-
- Text::RendererPtr mRenderer;
- Actor mRenderableActor;
-
- int mRenderingBackend;
- bool mHasBeenStaged : 1;
+ Text::ControllerPtr mController; ///< The text's controller.
+ Text::TypesetterPtr mTypesetter; ///< The text's typesetter.
+ WeakHandle<Actor> mControl; ///< The control where the renderer is added.
};
} // namespace Internal