X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fstyle.h;h=a99e17b0bd18aa435e00734c925e69cbae452f7e;hb=7018f61b640b6fcf9cb576b537bafcb6bb8240e8;hp=bd26a6dc33c9db856df86649fc2a7d172dfd799c;hpb=2605550b3ac430c2849ba72ec3f4872009d66eea;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/style.h b/dali-toolkit/internal/builder/style.h
index bd26a6d..a99e17b 100644
--- a/dali-toolkit/internal/builder/style.h
+++ b/dali-toolkit/internal/builder/style.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUILDER_STYLE_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
  * limitations under the License.
  */
 
-#include <dali/public-api/object/ref-object.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
 #include <dali-toolkit/internal/builder/dictionary.h>
+#include <dali/public-api/object/ref-object.h>
 
 namespace Dali
 {
@@ -27,7 +27,6 @@ namespace Toolkit
 {
 namespace Internal
 {
-
 class Style;
 typedef IntrusivePtr<Style> StylePtr;
 
@@ -55,16 +54,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;
 
   /**
    * 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
@@ -72,7 +96,7 @@ public:
    *
    * @param[in] handle The handle to apply the properties to
    */
-  void ApplyProperties( Handle handle ) const;
+  void ApplyProperties(Handle handle) const;
 
 protected:
   /**
@@ -83,28 +107,27 @@ protected:
   /**
    * @brief virtual destructor.
    */
-  virtual ~Style();
+  ~Style() override;
 
 private:
   // Not implemented
-  DALI_INTERNAL Style( const Style& rhs );
+  DALI_INTERNAL Style(const Style& rhs);
 
   // Not implemented
   DALI_INTERNAL Style& operator=(const Style& rhs);
 
 public:
   // Everything must be shallow-copiable.
-  Dictionary<StylePtr> subStates; // Each named style maps to a state.
+  Dictionary<StylePtr>      subStates; // Each named style maps to a state.
   Dictionary<Property::Map> visuals;
-  Property::Map properties;
-  Property::Array transitions;
-  Toolkit::TransitionData entryTransition;
-  Toolkit::TransitionData exitTransition;
+  Property::Map             properties;
+  Property::Array           transitions;
+  Toolkit::TransitionData   entryTransition;
+  Toolkit::TransitionData   exitTransition;
 };
 
-} // Internal
-} // Toolkit
-} // Dali
-
+} // namespace Internal
+} // namespace Toolkit
+} // namespace Dali
 
 #endif //DALI_TOOLKIT_INTERNAL_BUILDER_STYLE_H