X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-base.h;h=3b03dbe83bc0acc9b935e15f4ed15d9aa62be3ae;hb=10b2bff48c8430b673954ac767dabe7b6d0e303b;hp=65fb275c0043a10dbc52c39a310dd42e1070c4b7;hpb=eb3641c5f89d0ad118aff7862b1e7669ea9828d9;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h
index 65fb275..3b03dbe 100644
--- a/dali-toolkit/devel-api/visual-factory/visual-base.h
+++ b/dali-toolkit/devel-api/visual-factory/visual-base.h
@@ -1,7 +1,7 @@
 #ifndef DALI_TOOLKIT_VISUAL_BASE_H
 #define DALI_TOOLKIT_VISUAL_BASE_H
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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,22 +18,24 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/actors/actor.h>
+#include <dali/public-api/object/base-handle.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 namespace Visual
 {
 class Base;
 }
-}
+} // namespace DALI_INTERNAL
 
 namespace Visual
 {
@@ -67,8 +69,8 @@ namespace Visual
  * | size                    | VECTOR2           | No       | (1,1)                  | size of visual                                      |
  * | origin                  | INTEGER or STRING | No       | CENTER                 | origin of the visual @sa Dali::Toolkit::Align       |
  * | anchorPoint             | INTEGER or STRING | No       | CENTER                 | anchor point of the visual @sa Dali::Toolkit::Align |
- * | offsetPolicy            | VECTOR2           | No       | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::DevelVisual::Transform::Policy   |
- * | sizePolicy              | VECTOR2           | No       | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::DevelVisual::Transform::Policy   |
+ * | offsetPolicy            | VECTOR2           | No       | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::Visual::Transform::Policy   |
+ * | sizePolicy              | VECTOR2           | No       | ( RELATIVE, RELATIVE ) | @sa Dali::Toolkit::Visual::Transform::Policy   |
  *
  * Relative means that the component describes a factor of the parent control size;
  * size.x = 1 means full width; size.y = 0.5 means half height.
@@ -76,10 +78,9 @@ namespace Visual
  * Absolute means that the component describes world units (equivalent to pixels)
  *
  */
-class DALI_IMPORT_API Base : public BaseHandle
+class DALI_TOOLKIT_API Base : public BaseHandle
 {
 public:
-
   /**
    * @brief Create an empty Visual Handle
    */
@@ -97,7 +98,7 @@ public:
    *
    * @param[in] handle A reference to the copied handle.
    */
-  Base( const Base& handle );
+  Base(const Base& handle);
 
   /**
    * @brief This assignment operator is required for (smart) pointer semantics.
@@ -105,7 +106,7 @@ public:
    * @param [in] handle  A reference to the copied handle.
    * @return A reference to this.
    */
-  Base& operator=( const Base& handle );
+  Base& operator=(const Base& handle);
 
   /**
    * @brief Set the name of the visual
@@ -113,7 +114,7 @@ public:
    * Used by the styling system to animate properties
    * @param[in] name The name to give the visual
    */
-  void SetName( const std::string& name );
+  void SetName(const std::string& name);
 
   /**
    * @brief Get the name of the visual
@@ -121,7 +122,7 @@ public:
    * Used by the styling system to animate properties
    * @return The name of the visual
    */
-  const std::string& GetName();
+  const std::string& GetName() const;
 
   /**
    * @brief Sets the transform and the control size
@@ -129,7 +130,7 @@ public:
    * @param[in] transform A property map describing the transform
    * @param[in] controlSize The size of the parent control for visuals that need to scale internally.
    */
-  void SetTransformAndSize( const Dali::Property::Map& transform, Size controlSize );
+  void SetTransformAndSize(const Dali::Property::Map& transform, Size controlSize);
 
   /**
    * @brief Returns the height for a given width.
@@ -138,7 +139,7 @@ public:
    *
    * @return The height based on the width.
    */
-  float GetHeightForWidth( float width );
+  float GetHeightForWidth(float width);
 
   /**
    * @brief Returns the width for a given height.
@@ -147,7 +148,7 @@ public:
    *
    * @return The width based on the height.
    */
-  float GetWidthForHeight( float height );
+  float GetWidthForHeight(float height);
 
   /**
    * @brief Return the natural size of the visual.
@@ -160,7 +161,7 @@ public:
    *
    * @param[out] naturalSize The visual's natural size
    */
-  void GetNaturalSize( Vector2& naturalSize );
+  void GetNaturalSize(Vector2& naturalSize);
 
   /**
    * @brief Set the depth index of this visual.
@@ -170,7 +171,7 @@ public:
    *
    * @param[in] index The depth index of this visual.
    */
-  void SetDepthIndex( int index );
+  void SetDepthIndex(int index);
 
   /**
    * @brief Get the depth index of this visual
@@ -184,12 +185,17 @@ public:
    *
    * @param[out] map The visual property map.
    */
-  void CreatePropertyMap( Dali::Property::Map& map ) const;
+  void CreatePropertyMap(Dali::Property::Map& map) const;
 
-public: // Not intended for application developers
-
-  explicit DALI_INTERNAL Base(Internal::Visual::Base *impl);
+  /**
+   * @brief Get the type of this visual.
+   *
+   * @return The the type of this visual.
+   */
+  Visual::Type GetType() const;
 
+public: // Not intended for application developers
+  explicit DALI_INTERNAL Base(Internal::Visual::Base* impl);
 };
 
 } // namespace Visual