Implement default height for width and width for height for visuals and remove obsole...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / visual-factory / visual-base.h

diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.h b/dali-toolkit/devel-api/visual-factory/visual-base.h
index 4196276..f7ffb51 100644 (file)
--- a/dali-toolkit/devel-api/visual-factory/visual-base.h
+++ b/dali-toolkit/devel-api/visual-factory/visual-base.h
@@ -128,32 +128,39 @@ public:
   const std::string& GetName();
 
   /**
-   * @brief Set the size of the painting area.
+   * @brief Sets the transform and the control size
    *
-   * @param[in] size The size of the painting area.
+   * @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 SetSize( const Vector2& size );
+  void SetTransformAndSize( const Dali::Property::Map& transform, Size controlSize );
 
   /**
-   * @brief Get the size of the painting area.
+   * @brief Returns the height for a given width.
+   *
+   * @param[in] width Width to use.
    *
-   * @return The size of the visual's painting area.
+   * @return The height based on the width.
    */
-  const Vector2& GetSize() const;
+  float GetHeightForWidth( float width );
 
   /**
-   * @brief Returns the height for a given width.
+   * @brief Returns the width for a given height.
    *
-   * @param[in] width Width to use.
+   * @param[in] height Height to use.
    *
-   * @return The height based on the width.
+   * @return The width based on the height.
    */
-  float GetHeightForWidth( float width ) const;
+  float GetWidthForHeight( float height );
 
   /**
    * @brief Return the natural size of the visual.
    *
-   * Deriving classes stipulate the natural size and by default a visual has a ZERO natural size.
+   * Deriving classes stipulate the natural size and by default a
+   * visual has a ZERO natural size.
+   *
+   * @note A visual may not actually have a natural size until it has
+   * been placed on stage and acquired all it's resources.
    *
    * @param[out] naturalSize The visual's natural size
    */
@@ -177,38 +184,12 @@ public:
   float GetDepthIndex() const;
 
   /**
-   * @brief Remove the renderer from the actor and reset the visual self.
-   *
-   * This function can be called with an empty handle. If the visual is empty, this is a no-op.
-   *
-   * @param[in] actor The actor to be set off stage.
-   */
-  void RemoveAndReset( Actor& actor );
-
-  /**
    * @brief Create the property map representing this visual.
    *
    * @param[out] map The visual property map.
    */
   void CreatePropertyMap( Dali::Property::Map& map ) const;
 
-  /**
-   * @brief Sets the value of an existing property.
-   *
-   * @param [in] index The index of the property.
-   * @param [in] propertyValue The new value of the property.
-   */
-  void SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-
-  /**
-   * @brief Retrieves a property value.
-   *
-   * @param [in] index The index of the property.
-   *
-   * @return The property value.
-   */
-  Dali::Property::Value GetProperty( Dali::Property::Index index );
-
 public: // Not intended for application developers
 
   explicit DALI_INTERNAL Base(Internal::Visual::Base *impl);