* @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 );
+ static TextVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
+
+ /**
+ * @brief Converts all strings keys in property map to index keys. Property Map can then be merged correctly.
+ * @param[in,out] propertyMap containing string keys or a mix of strings and indexes. Will be changed to index keys.
+ */
+ static void ConvertStringKeysToIndexKeys( Property::Map& propertyMap );
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
- virtual float GetHeightForWidth( float width ) const;
+ virtual float GetHeightForWidth( float width );
/**
* @copydoc Visual::Base::GetNaturalSize()
virtual void OnSetTransform();
private:
-
/**
- * 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
+ * @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 SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+ void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
/**
- * @brief Creates the text's renderer.
+ * @brief Updates the text's renderer.
+ * @param[in] initializeRendererAndTexture Set flag to true to initialize textures and add renderer to control.
*/
- void CreateRenderer();
+ void UpdateRenderer( bool initializeRendererAndTexture );
/**
- * @brief Destroys the text's renderer.
+ * @brief Removes the texture set from the renderer.
*/
- void DestroyRenderer();
+ void RemoveTextureSet();
private:
Text::ControllerPtr mController; ///< The text's controller.