Merge "DALi Version 1.2.11" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / border / border-visual.h

diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h
index b30f36a..4f999b4 100644 (file)
--- a/dali-toolkit/internal/visuals/border/border-visual.h
+++ b/dali-toolkit/internal/visuals/border/border-visual.h
@@ -20,9 +20,10 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/common/intrusive-ptr.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
 
 namespace Dali
 {
@@ -33,8 +34,11 @@ namespace Toolkit
 namespace Internal
 {
 
+class BorderVisual;
+typedef IntrusivePtr< BorderVisual > BorderVisualPtr;
+
 /**
- * The renderer which renders a solid color to the control's quad border fixed to a specified size.
+ * The visual which renders a solid color to the control's quad border fixed to a specified size.
  *
  * The following properties are required for create a BorderRender
  *
@@ -44,12 +48,21 @@ namespace Internal
  * | borderSize      | FLOAT       |
  * | antiAliasing    | BOOLEAN     |
  */
-
-class BorderVisual : public Visual
+class BorderVisual : public Visual::Base
 {
 public:
 
   /**
+   * @brief Create a new border visual.
+   *
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+   * @return A smart-pointer to the newly allocated visual.
+   */
+  static BorderVisualPtr New( VisualFactoryCache& factoryCache );
+
+protected:
+
+  /**
    * @brief Constructor.
    *
    * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
@@ -61,29 +74,30 @@ public:
    */
   virtual ~BorderVisual();
 
-public:  // from Visual
-
   /**
-   * @copydoc Visual::SetClipRect
+   * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void SetClipRect( const Rect<int>& clipRect );
+  virtual void DoSetProperties( const Property::Map& propertyMap );
 
-protected:
+  /**
+   * @copydoc Visual::Base::DoSetOnStage
+   */
+  virtual void DoSetOnStage( Actor& actor );
 
   /**
-   * @copydoc Visual::DoInitialize
+   * @copydoc Visual::Base::CreatePropertyMap
    */
-  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+  virtual void DoCreatePropertyMap( Property::Map& map ) const;
 
   /**
-   * @copydoc Visual::DoSetOnStage
+   * @copydoc Visual::Base::DoSetProperty
    */
-  virtual void DoSetOnStage( Actor& actor );
+  virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
 
   /**
-   * @copydoc Visual::CreatePropertyMap
+   * @copydoc Visual::Base::DoGetProperty
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
+  virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
 
 public: