// 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>
-#include <dali-toolkit/internal/text/text-scroller.h>
namespace Dali
{
public:
/**
- * @brief Constructor.
+ * @brief Create a new text visual.
*
- * @param[in] factoryCache The VisualFactoryCache object
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @return A smart-pointer to the newly allocated visual.
*/
- TextVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
- */
- ~TextVisual();
-
- /**
- *
- */
- void SetTextControlInterface( Text::ControlInterface* controlInterface );
+ static TextVisualPtr New( VisualFactoryCache& factoryCache );
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
- float GetHeightForWidth( float width ) const;
+ virtual float GetHeightForWidth( float width ) const;
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
- virtual void SetSize( const Vector2& size );
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
- * @copydoc Visual::Base::GetNaturalSize()
+ * @copydoc Visual::Base::CreatePropertyMap()
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
+protected:
/**
- * @copydoc Visual::Base::CreatePropertyMap()
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache The VisualFactoryCache object
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
+ TextVisual( VisualFactoryCache& factoryCache );
+
+ /**
+ * @brief A reference counted object may only be deleted by calling Unreference().
+ */
+ virtual ~TextVisual();
+
+ // from Visual::Base
-protected: // from Visual::Base
/**
- * @copydoc Visual::Base::DoInitialize()
+ * @copydoc Visual::Base::DoSetProperties()
*/
- virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+ virtual void DoSetProperties( const Property::Map& propertyMap );
/**
* @copydoc Visual::Base::DoSetOnStage()
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 );
-
- /**
- * @copydoc Visual::Base::DoGetProperty
- */
- virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+ virtual void OnSetTransform();
private:
-
/**
- * @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 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.
*/
- void RenderText();
+ void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
/**
- * @brief Stops the text auto scroll.
+ * @brief Updates the text's renderer.
*/
- void StopTextAutoScrolling();
+ void UpdateRenderer();
/**
- * @brief Set up Autoscrolling.
+ * @brief Removes the texture set from the renderer.
*/
- void SetUpAutoScrolling();
+ void RemoveTextureSet();
private:
- Text::ControllerPtr mController; ///< The text's controller.
- Actor mSelf;
-
- Text::RendererPtr mRenderer;
- Text::TextScrollerPtr mTextScroller;
- 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