X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Fcustom-actor-internal.h;h=259b785f46b1762f2a7811aa84ae8444cb017bfc;hb=01c39de261f6eb4e759c7a249e5d67dfef83bca2;hp=f8515f332fce29fe42aaa3b657732eac3fdbeb89;hpb=7c6f8ed43521c52d6cc46a7e3e3e40069514f818;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h
index f8515f3..259b785 100644
--- a/dali/internal/event/actors/custom-actor-internal.h
+++ b/dali/internal/event/actors/custom-actor-internal.h
@@ -22,6 +22,7 @@
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/actors/actor-declarations.h>
 #include <dali/public-api/actors/custom-actor.h>
+#include <dali/public-api/animation/animation.h>
 
 namespace Dali
 {
@@ -57,6 +58,13 @@ public:
     return *mImpl;
   }
 
+  /**
+   * Get the type info associated with this object.
+   *
+   * @return The type info
+   */
+  Dali::TypeInfo GetTypeInfo();
+
 protected:
 
   /**
@@ -69,9 +77,9 @@ private:
   /**
    * @copydoc Internal::Actor::OnStageConnectionExternal
    */
-  virtual void OnStageConnectionExternal()
+  virtual void OnStageConnectionExternal( int depth )
   {
-    mImpl->OnStageConnection();
+    mImpl->OnStageConnection( depth );
   }
 
   /**
@@ -134,6 +142,14 @@ private:
   }
 
   /**
+   * @copydoc Internal::Actor::OnHoverEvent
+   */
+  virtual bool OnHoverEvent(const HoverEvent& event)
+  {
+    return mImpl->OnHoverEvent(event);
+  }
+
+  /**
    * @copydoc Internal::Actor::OnKeyEvent
    */
   virtual bool OnKeyEvent(const KeyEvent& event)
@@ -142,19 +158,83 @@ private:
   }
 
   /**
-   * @copydoc Internal::Actor::OnMouseWheelEvent
+   * @copydoc Internal::Actor::OnWheelEvent
+   */
+  virtual bool OnWheelEvent(const WheelEvent& event)
+  {
+    return mImpl->OnWheelEvent(event);
+  }
+
+  /**
+   * @copydoc Internal::Actor::OnRelayout
+   */
+  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
+  {
+    mImpl->OnRelayout( size, container );
+  }
+
+  /**
+   * @copydoc Internal::Actor::OnSetResizePolicy
+   */
+  virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+  {
+    mImpl->OnSetResizePolicy( policy, dimension );
+  }
+
+  /**
+   * @copydoc Internal::Actor::GetNaturalSize
+   */
+  virtual Vector3 GetNaturalSize() const
+  {
+    return mImpl->GetNaturalSize();
+  }
+
+  /**
+   * @copydoc Internal::Actor::CalculateChildSize
+   */
+  virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
+  {
+    return mImpl->CalculateChildSize( child, dimension );
+  }
+
+  /**
+   * @copydoc Internal::Actor::GetHeightForWidth
+   */
+  virtual float GetHeightForWidth( float width )
+  {
+    return mImpl->GetHeightForWidth( width );
+  }
+
+  /**
+   * @copydoc Internal::Actor::GetWidthForHeight
+   */
+  virtual float GetWidthForHeight( float height )
+  {
+    return mImpl->GetWidthForHeight( height );
+  }
+
+  /**
+   * @copydoc Internal::Actor::RelayoutDependentOnChildren
+   */
+  virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS )
+  {
+    return mImpl->RelayoutDependentOnChildren( dimension );
+  }
+
+  /**
+   * @copydoc Internal::Actor::OnCalculateRelayoutSize
    */
-  virtual bool OnMouseWheelEvent(const MouseWheelEvent& event)
+  virtual void OnCalculateRelayoutSize( Dimension::Type dimension )
   {
-    return mImpl->OnMouseWheelEvent(event);
+    return mImpl->OnCalculateRelayoutSize( dimension );
   }
 
   /**
-   * @copydoc Internal::Actor::GetChildByAlias
+   * @copydoc Internal::Actor::OnLayoutNegotiated
    */
-  virtual Dali::Actor GetChildByAlias(const std::string& actorAlias)
+  virtual void OnLayoutNegotiated( float size, Dimension::Type dimension )
   {
-    return mImpl->GetChildByAlias(actorAlias);
+    return mImpl->OnLayoutNegotiated( size, dimension );
   }
 
   /**