Merge Handle & Constrainable

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor.h

diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h
index 21d91af..248225a 100644 (file)
--- a/dali/public-api/actors/actor.h
+++ b/dali/public-api/actors/actor.h
@@ -27,7 +27,7 @@
 #include <dali/public-api/animation/active-constraint-declarations.h>
 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/object/constrainable.h>
+#include <dali/public-api/object/handle.h>
 #include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
@@ -227,17 +227,30 @@ typedef ActorContainer::const_iterator ActorConstIter; ///< Const iterator for D
  * Key events are received by an actor once set to grab key events, only one actor can be set as focused.
  *
  * @nosubgrouping
+ *
+ * Signals
+ * | %Signal Name      | Method                       |
+ * |-------------------|------------------------------|
+ * | touched           | @ref TouchedSignal()         |
+ * | hovered           | @ref HoveredSignal()         |
+ * | mouse-wheel-event | @ref MouseWheelEventSignal() |
+ * | on-stage          | @ref OnStageSignal()         |
+ * | off-stage         | @ref OffStageSignal()        |
+ *
+ * Actions
+ * | %Action Name      | %Actor method called         |
+ * |-------------------|------------------------------|
+ * | show              | %SetVisible( true )          |
+ * | hide              | %SetVisible( false )         |
  */
-class DALI_IMPORT_API Actor : public Constrainable
+class DALI_IMPORT_API Actor : public Handle
 {
 public:
 
   // Typedefs
-
   typedef Signal< bool (Actor, const TouchEvent&)> TouchSignalType;                ///< Touch signal type
   typedef Signal< bool (Actor, const HoverEvent&)> HoverSignalType;                ///< Hover signal type
   typedef Signal< bool (Actor, const MouseWheelEvent&) > MouseWheelEventSignalType;///< Mousewheel signal type
-  typedef Signal< void (Actor, const Vector3&) > SetSizeSignalType; ///< SetSize signal type
   typedef Signal< void (Actor) > OnStageSignalType;  ///< Stage connection signal type
   typedef Signal< void (Actor) > OffStageSignalType; ///< Stage disconnection signal type
 
@@ -290,22 +303,6 @@ public:
   static const Property::Index SIZE_MODE_FACTOR;      ///< name "size-mode-factor",      type VECTOR3
   /** @} */
 
-  /// @name Signals
-  /** @{ */
-  static const char* const SIGNAL_TOUCHED;            ///< name "touched",           @see TouchedSignal()
-  static const char* const SIGNAL_HOVERED;            ///< name "hovered",           @see HoveredSignal()
-  static const char* const SIGNAL_MOUSE_WHEEL_EVENT;  ///< name "mouse-wheel-event", @see MouseWheelEventSignal()
-  static const char* const SIGNAL_SET_SIZE;           ///< name "set-size",          @see SetSizeSignal()
-  static const char* const SIGNAL_ON_STAGE;           ///< name "on-stage",          @see OnStageSignal()
-  static const char* const SIGNAL_OFF_STAGE;          ///< name "off-stage",         @see OffStageSignal()
-  /** @} */
-
-  /// @name Actions
-  /** @{ */
-  static const char* const ACTION_SHOW;               ///< name "show",   @see SetVisible()
-  static const char* const ACTION_HIDE;               ///< name "hide",   @see SetVisible()
-  /** @} */
-
   // Creation
 
   /**
@@ -1255,21 +1252,6 @@ public: // Signals
   MouseWheelEventSignalType& MouseWheelEventSignal();
 
   /**
-   * @brief Signal to indicate when the actor's size is set by application code.
-   *
-   * This signal is emitted when actors size is being <b>set</b> by application code.
-   * This signal is <b>not</b> emitted when size is animated
-   * Note! GetCurrentSize might not return this same size as the set size message may still be queued
-   * A callback of the following type may be connected:
-   * @code
-   *   void YourCallback(Actor actor, const Vector3& newSize);
-   * @endcode
-   * @pre The Actor has been initialized.
-   * @return The signal to connect to.
-   */
-  SetSizeSignalType& SetSizeSignal();
-
-  /**
    * @brief This signal is emitted after the actor has been connected to the stage.
    *
    * When an actor is connected, it will be directly or indirectly parented to the root Actor.