X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fstyle.h;h=0265ff6f15ced72ba4389f7e0c80c7610b3ba3b6;hb=c052b6678e2c6d8a65545dbbe4531ea7057c1999;hp=2fb4e8367a33f25098d0ed4766b8ad692c6df9fc;hpb=f781537e1453775663bb7f89adb495957dfa61ef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/style.h b/dali-toolkit/internal/builder/style.h
index 2fb4e83..0265ff6 100644
--- a/dali-toolkit/internal/builder/style.h
+++ b/dali-toolkit/internal/builder/style.h
@@ -55,18 +55,41 @@ public:
    * through sub-states.
    *
    * @param[in] handle The handle to apply the visuals to
+   * @param[in] instancedProperties The maps from which to get instanced properties
    */
-  void ApplyVisualsAndPropertiesRecursively( Handle handle ) const;
+  void ApplyVisualsAndPropertiesRecursively( Handle handle,
+                                             const Dictionary<Property::Map>& instancedProperties ) const;
 
-
-private:
   /**
    * Apply the visuals of the style to the control pointed at by
    * handle.
    *
    * @param[in] handle The handle to apply the visuals to
+   * @param[in] instancedProperties The maps from which to get instanced properties
+   */
+  void ApplyVisuals( Handle handle,
+                     const Dictionary<Property::Map>& instancedProperties ) const;
+
+  /**
+   * Apply the properties from the visualMaps and the instancedProperties
+   * to the control pointed at by handle.
+   *
+   * @param[in] handle The handle to apply the properties to
+   * @param[in] visualMaps The visual maps from which to get the styled properties
+   * @param[in] instancedProperties The maps from which to get instanced properties
+   */
+  static void ApplyVisuals( Handle handle,
+                            const Dictionary<Property::Map>& visualMaps,
+                            const Dictionary<Property::Map>& instancedProperties );
+
+  /**
+   * Apply the properties from the visualMap and optional instancedProperties
+   * to the control pointed at by handle.
    */
-  void ApplyVisuals( Handle handle ) const;
+  static void ApplyVisual( Handle handle,
+                           const std::string& visualName,
+                           const Property::Map& visualMap,
+                           const Property::Map* instancedProperties );
 
   /**
    * Apply the properties of the style to the control pointed at by
@@ -85,7 +108,7 @@ protected:
   /**
    * @brief virtual destructor.
    */
-  virtual ~Style();
+  ~Style() override;
 
 private:
   // Not implemented