Fix activate action on Control

Change-Id: Ia3d2c920984a2dc322a9a9765818835706f1bc6d
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index 6f9275c..9d64b1f 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -901,12 +901,17 @@ bool Control::DoAction(BaseObject* object, const std::string& actionName, const
 {
   bool ret = false;
 
 {
   bool ret = false;
 

-  return ret;
-}
+  if( object && (actionName == Toolkit::Control::ACTION_CONTROL_ACTIVATED) )
+  {
+    Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
+    if( control )
+    {
+      // if cast succeeds there is an implementation so no need to check
+      control.GetImplementation().OnActivated();
+    }
+  }

 
 

-void Control::DoActivatedAction(const PropertyValueContainer& attributes)
-{
-  OnActivated();
+  return ret;

 }
 
 void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
 }
 
 void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change )

diff --git a/capi/dali-toolkit/public-api/controls/control-impl.h b/capi/dali-toolkit/public-api/controls/control-impl.h
index ac38162..e989b77 100644 (file)
--- a/capi/dali-toolkit/public-api/controls/control-impl.h
+++ b/capi/dali-toolkit/public-api/controls/control-impl.h
@@ -536,13 +536,6 @@ private: // From CustomActorImpl, derived classes can override these.
 private:
 
   /**
 private:
 
   /**

-   * @brief Perform the activated action.
-   *
-   * @param[in] attributes The attributes to perfrom this action.
-   */
-  void DoActivatedAction(const PropertyValueContainer& attributes);
-
-  /**

    * @brief This method is the callback for the StyleChangeSignal from StyleManager
    *
    * @param[in] styleManager The StyleManager Object
    * @brief This method is the callback for the StyleChangeSignal from StyleManager
    *
    * @param[in] styleManager The StyleManager Object