X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Ftext%2Ftext-visual.h;h=9edf08c68b54464d78e722ab0c3a23e4c53ec791;hp=3e3791ef1f1a45e0ac41bf85ced8e2c0b82e4951;hb=6c02c5852ca329f720e4ae72d9cef2524629574c;hpb=5e04f7584e88f851481db93078a22100bbf88015

diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h
index 3e3791e..9edf08c 100644
--- a/dali-toolkit/internal/visuals/text/text-visual.h
+++ b/dali-toolkit/internal/visuals/text/text-visual.h
@@ -71,16 +71,23 @@ public:
    * @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()
@@ -129,24 +136,25 @@ protected:
   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 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.