X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=e5f6df146b65693718dd86615594e129df833d4f;hb=d6f1c901d74aef4e66ffb6565bb61de952a090a3;hp=bd05356983d6dec635556ae039d2ccf3e2ca0464;hpb=1972f043026a3e1bdcaad71c17859a8f324d1e6d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
index bd05356..e5f6df1 100644
--- a/dali-toolkit/internal/visuals/color/color-visual.h
+++ b/dali-toolkit/internal/visuals/color/color-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -18,8 +18,11 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#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
 {
@@ -30,8 +33,11 @@ namespace Toolkit
 namespace Internal
 {
 
+class ColorVisual;
+typedef IntrusivePtr< ColorVisual > ColorVisualPtr;
+
 /**
- * The renderer which renders a solid color to the control's quad
+ * The visual which renders a solid color to the control's quad
  *
  * The following properties are required for create a ColorRender
  *
@@ -39,63 +45,54 @@ namespace Internal
  * |-----------------|-------------|
  * | mixColor        | VECTOR4     |
  */
-class ColorVisual: public Visual
+class ColorVisual: public Visual::Base
 {
 public:
 
   /**
-   * @brief Constructor.
+   * @brief Create a new color 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.
    */
-  ColorVisual( VisualFactoryCache& factoryCache );
-
-  /**
-   * @brief A reference counted object may only be deleted by calling Unreference().
-   */
-  virtual ~ColorVisual();
+  static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
 
 public:  // from Visual
 
   /**
-   * @copydoc Visual::SetSize
+   * @copydoc Visual::Base::CreatePropertyMap
    */
-  virtual void SetSize( const Vector2& size );
+  virtual void DoCreatePropertyMap( Property::Map& map ) const;
 
-  /**
-   * @copydoc Visual::SetClipRect
-   */
-  virtual void SetClipRect( const Rect<int>& clipRect );
+protected:
 
   /**
-   * @copydoc Visual::SetOffset
+   * @brief Constructor.
+   *
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    */
-  virtual void SetOffset( const Vector2& offset );
+  ColorVisual( VisualFactoryCache& factoryCache );
 
   /**
-   * @copydoc Visual::CreatePropertyMap
+   * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+  virtual ~ColorVisual();
 
   /**
-   * @copydoc Visual::DoInitialize
+   * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+  virtual void DoSetProperties( const Property::Map& propertyMap );
 
   /**
-   * @copydoc Visual::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOnStage
    */
   virtual void DoSetOnStage( Actor& actor );
 
-public:
-
   /**
-   * Set the color for rendering.
-   * @param[in] color The color to be rendered.
+   * @copydoc Visual::Base::OnSetTransform
    */
-  void SetColor( const Vector4& color );
+  virtual void OnSetTransform();
 
 private:
   /**
@@ -110,12 +107,6 @@ private:
 
   // Undefined
   ColorVisual& operator=( const ColorVisual& colorRenderer );
-
-private:
-
-  Vector4 mMixColor;
-  Property::Index mMixColorIndex;
-
 };
 
 } // namespace Internal