X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fgradient%2Fgradient-visual.h;h=70cdb4e9a452588ae1c15e7c07d26600d4802187;hp=6a6c60b985f6a8b0e4bc424fd9e381bdabdbfa25;hb=dea624eb348a4926d8761c8a1364f03f9f71acf5;hpb=cc0aefb3259c6fe818d9949ebf768843cc01e6fd

diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
index 6a6c60b..70cdb4e 100644
--- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h
+++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
 
 /*
- * Copyright (c) 2015 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.
@@ -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>
 #include <dali-toolkit/internal/visuals/gradient/gradient.h>
 
 namespace Dali
@@ -33,6 +36,8 @@ namespace Internal
 {
 
 class Gradient;
+class GradientVisual;
+typedef IntrusivePtr< GradientVisual > GradientVisualPtr;
 
 /**
  * The visual which renders smooth transition of colors to the control's quad.
@@ -66,7 +71,7 @@ class Gradient;
  * Valid values for spreadMethod are 'pad', 'repeat' and 'reflect.'
  * If not provided, 'objectBoundingBox' is used as default gradient units, and 'pad' is used as default spread method.
  */
-class GradientVisual: public Visual
+class GradientVisual: public Visual::Base
 {
 public:
 
@@ -80,49 +85,54 @@ public:
   };
 
   /**
-   * @brief Constructor.
+   * @brief Create a new gradient 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.
    */
-  GradientVisual( VisualFactoryCache& factoryCache );
+  static GradientVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties );
+
+public:  // from Visual
 
   /**
-   * @brief A reference counted object may only be deleted by calling Unreference().
+   * @copydoc Visual::Base::CreatePropertyMap
    */
-  ~GradientVisual();
-
-public:  // from Visual
+  void DoCreatePropertyMap( Property::Map& map ) const override;
 
   /**
-   * @copydoc Visual::SetSize
+   * @copydoc Visual::Base::CreateInstancePropertyMap
    */
-  virtual void SetSize( const Vector2& size );
+  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
+
+protected:
 
   /**
-   * @copydoc Visual::SetClipRect
+   * @brief Constructor.
+   *
+   * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
    */
-  virtual void SetClipRect( const Rect<int>& clipRect );
+  GradientVisual( VisualFactoryCache& factoryCache );
 
   /**
-   * @copydoc Visual::SetOffset
+   * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual void SetOffset( const Vector2& offset );
+  virtual ~GradientVisual();
 
   /**
-   * @copydoc Visual::CreatePropertyMap
+   * @copydoc Visual::Base::DoSetProperties
    */
-  virtual void DoCreatePropertyMap( Property::Map& map ) const;
+  void DoSetProperties( const Property::Map& propertyMap ) override;
 
-protected:
   /**
-   * @copydoc Visual::DoInitialize
+   * @copydoc Visual::Base::OnSetTransform
    */
-  virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+  void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  virtual void DoSetOnStage( Actor& actor );
+  void DoSetOnScene( Actor& actor ) override;
 
 private:
 
@@ -158,6 +168,7 @@ private:
   Matrix3 mGradientTransform;
   IntrusivePtr<Gradient> mGradient;
   Type mGradientType;
+  bool mIsOpaque; ///< Set to false if any of the stop colors are not opaque
 };
 
 } // namespace Internal