Merge changes I83c26470,I6fe45a0f into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / canvas-renderer / common / drawable-impl.h

diff --git a/dali/internal/canvas-renderer/common/drawable-impl.h b/dali/internal/canvas-renderer/common/drawable-impl.h
index 15e2280..d4439ed 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-impl.h
+++ b/dali/internal/canvas-renderer/common/drawable-impl.h
@@ -19,9 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#ifdef THORVG_SUPPORT
-#include <thorvg.h>
-#endif
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
@@ -43,7 +40,7 @@ public:
   /**
    * @brief Enumeration for type of drawable.
    */
-  enum class DrawableTypes
+  enum class Types
   {
     NONE = 0,      ///< Means that type is not defined.
     SHAPE,         ///< Meaning of Shape class that inherits Drawable.
@@ -67,46 +64,51 @@ public:
   void Create();
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::SetOpacity
+   * @copydoc Dali::CanvasRenderer::Drawable::SetOpacity()
    */
   virtual bool SetOpacity(float opacity);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::GetOpacity
+   * @copydoc Dali::CanvasRenderer::Drawable::GetOpacity()
    */
   virtual float GetOpacity() const;
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Rotate
+   * @copydoc Dali::CanvasRenderer::Drawable::Rotate()
    */
   virtual bool Rotate(Degree degree);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Scale
+   * @copydoc Dali::CanvasRenderer::Drawable::Scale()
    */
   virtual bool Scale(float factor);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Translate
+   * @copydoc Dali::CanvasRenderer::Drawable::Translate()
    */
   virtual bool Translate(Vector2 translate);
 
   /**
-   * @copydoc Dali::CanvasRenderer::Drawable::Transform
+   * @copydoc Dali::CanvasRenderer::Drawable::Transform()
    */
   virtual bool Transform(const Dali::Matrix3& matrix);
 
   /**
-   * @brief Set whether drawable added to the other object(canvas or drawable) or not.
+   * @copydoc Dali::CanvasRenderer::Drawable::GetBoundingBox
+   */
+  virtual Rect<float> GetBoundingBox() const;
+
+  /**
+   * @brief Set whether this drawable object was added to other object(CanvasRenderer or DrawableGroup) or not.
    * @param[in] added Ture if added, false otherwise.
    */
-  virtual void SetDrawableAdded(bool added);
+  virtual void SetAdded(bool added);
 
   /**
-   * @brief Returns whether this object was added to another object(canvas or drawable).
+   * @brief Returns whether this drawable object was added to another object(CanvasRenderer or DrawableGroup).
    * @return Returns Ture if added, false otherwise.
    */
-  virtual bool IsDrawableAdded();
+  virtual bool IsAdded() const;
 
   /**
    * @brief Returns a drawable object pointer.
@@ -136,13 +138,13 @@ public:
    * @brief Set drawable's type.
    * @param[in] type Type of drawable.
    */
-  virtual void SetDrawableType(DrawableTypes type);
+  virtual void SetType(Types type);
 
   /**
    * @brief Get drawable's type.
    * @return Returns type of drawable.
    */
-  virtual DrawableTypes GetDrawableType() const;
+  virtual Types GetType() const;
 
   /**
    * @brief Returns a drawable's implements object pointer.
@@ -156,7 +158,7 @@ public:
   Drawable& operator=(Drawable&&) = delete;
 
 private:
-  Dali::Internal::Adaptor::Drawable* pImpl = nullptr;
+  Dali::Internal::Adaptor::Drawable* mImpl = nullptr;
 };
 
 } // namespace Adaptor