*
*/
-// 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>
-#include <dali-toolkit/internal/text/text-scroller.h>
namespace Dali
{
* @brief Create a new text visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static TextVisualPtr New( VisualFactoryCache& factoryCache );
-
- /**
- * @brief Sets the text control interface which is needed to communicate with a control.
- * @param[in] controlInterface Pointer to the control-interface.
- */
- void SetTextControlInterface( Text::ControlInterface* controlInterface );
+ static TextVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
- float GetHeightForWidth( float width ) const;
-
- /**
- * @copydoc Visual::Base::GetNaturalSize()
- */
- virtual void SetSize( const Vector2& size );
+ virtual float GetHeightForWidth( float width );
/**
* @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 );
-
- /**
- * @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.
- WeakHandle<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