From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Thu, 12 Jun 2014 09:58:19 +0000 (+0100)
Subject: Fix activate action on Control
X-Git-Tag: dali_1.0.0~52
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=33e1324f5027b567ff9da9bbd7c172b35f1eba03

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
--- 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;
 
-  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 )
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
--- 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:
 
   /**
-   * @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