X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fborder%2Fborder-visual.h;h=aa7a69b5dcd6a3194abf559e3afad006a61f02c3;hb=593ab514474062b4d3de55682e63627a79b2eb5a;hp=d85ae9583668ce6178f16028079dd1fc855ae46b;hpb=cc0aefb3259c6fe818d9949ebf768843cc01e6fd;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h
index d85ae95..aa7a69b 100644
--- a/dali-toolkit/internal/visuals/border/border-visual.h
+++ b/dali-toolkit/internal/visuals/border/border-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -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,6 +34,9 @@ namespace Toolkit
 namespace Internal
 {
 
+class BorderVisual;
+typedef IntrusivePtr< BorderVisual > BorderVisualPtr;
+
 /**
  * The visual which renders a solid color to the control's quad border fixed to a specified size.
  *
@@ -44,66 +48,57 @@ namespace Internal
  * | borderSize      | FLOAT       |
  * | antiAliasing    | BOOLEAN     |
  */
-
-class BorderVisual : public Visual
+class BorderVisual : public Visual::Base
 {
 public:
 
   /**
-   * @brief Constructor.
+   * @brief Create a new border 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.
    */
-  BorderVisual( VisualFactoryCache& factoryCache );
-
-  /**
-   * @brief A reference counted object may only be deleted by calling Unreference().
-   */
-  virtual ~BorderVisual();
+  static BorderVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
 
-public:  // from Visual
+protected:
 
   /**
-   * @copydoc Visual::SetClipRect
+   * @brief Constructor.
+   *
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    */
-  virtual void SetClipRect( const Rect<int>& clipRect );
-
-protected:
+  BorderVisual( VisualFactoryCache& factoryCache );
 
   /**
-   * @copydoc Visual::DoInitialize
+   * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+  virtual ~BorderVisual();
 
   /**
-   * @copydoc Visual::DoSetOnStage
+   * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoSetOnStage( Actor& actor );
+  void DoSetProperties( const Property::Map& propertyMap ) override;
 
   /**
-   * @copydoc Visual::CreatePropertyMap
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-public:
+  void DoSetOnScene( Actor& actor ) override;
 
   /**
-   * Set the color of the border.
-   * @param[in] color The border color.
+   * @copydoc Visual::Base::CreatePropertyMap
    */
-  void SetBorderColor( const Vector4& color);
+  void DoCreatePropertyMap( Property::Map& map ) const override;
 
   /**
-   * Set the size of the border.
-   * @param[in] size The border size.
+   * @copydoc Visual::Base::CreateInstancePropertyMap
    */
-  void SetBorderSize( float size );
+  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
 
   /**
-   * Enable/Disable the anti-aliasing.
-   * @param[in] enable Whether the anti-aliasing be enabled or not.
+   * @copydoc Visual::Base::OnSetTransform
    */
-  void RequireAntiAliasing( bool antiAliasing );
+  void OnSetTransform() override;
 
 private:
 
@@ -124,6 +119,13 @@ private:
    */
   Geometry CreateBorderGeometry();
 
+  /**
+   * Helper method to set individual values by index key.
+   * @param[in] index The index key of the value
+   * @param[in] value The value
+   */
+  void DoSetProperty( Property::Index index, const Property::Value& value );
+
   // Undefined
   BorderVisual( const BorderVisual& borderRenderer );