Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / actor-impl.h

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
index 950dc6c..bf58f23 100755 (executable)
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -1229,18 +1229,6 @@ public:
   float GetMaximumSize( Dimension::Type dimension ) const;
 
   /**
-   * @brief Sets the update size hint of an actor for partial update.
-   * @param [in] updateSizeHint The new updateSizeHint.
-   */
-  void SetUpdateSizeHint( const Vector2& updateSizeHint );
-
-  /**
-   * @brief Return the update size hint of actor
-   * @return Return the update size hint
-   */
-  Vector2 GetUpdateSizeHint() const;
-
-  /**
    * @copydoc Dali::Actor::AddRenderer()
    */
   uint32_t AddRenderer( Renderer& renderer );
@@ -1752,6 +1740,17 @@ private:
     };
   };
 
+  struct AnimatedSizeFlag
+  {
+    enum Type
+    {
+      CLEAR  = 0,
+      WIDTH  = 1,
+      HEIGHT = 2,
+      DEPTH  = 4
+    };
+  };
+
   // Remove default constructor and copy constructor
   Actor() = delete;
   Actor( const Actor& ) = delete;
@@ -1982,10 +1981,12 @@ protected:
   Vector3         mTargetSize;        ///< Event-side storage for size (not a pointer as most actors will have a size)
   Vector3         mTargetPosition;    ///< Event-side storage for position (not a pointer as most actors will have a position)
   Vector3         mTargetScale;       ///< Event-side storage for scale
+  Vector3         mAnimatedSize;      ///< Event-side storage for size animation
 
   std::string     mName;              ///< Name of the actor
   uint32_t        mSortedDepth;       ///< The sorted depth index. A combination of tree traversal and sibling order.
   int16_t         mDepth;             ///< The depth in the hierarchy of the actor. Only 32,767 levels of depth are supported
+  uint16_t        mUseAnimatedSize;   ///< Whether the size is animated.
 
   const bool mIsRoot                               : 1; ///< Flag to identify the root actor
   const bool mIsLayer                              : 1; ///< Flag to identify that this is a layer