Fixed Control and Magnifier API

Change-Id: I0cdf52157b2c4633d0710b37666d1b714e816859

diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
index 6dd16d1..e51ee1e 100644 (file)
--- a/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
+++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp
@@ -76,6 +76,11 @@ Magnifier::~Magnifier()
 {
 }
 
 {
 }
 

+Magnifier Magnifier::DownCast( BaseHandle handle )
+{
+  return Control::DownCast<Magnifier, Internal::Magnifier>(handle);
+}
+

 void Magnifier::SetSourceActor(Actor actor)
 {
   GetImpl(*this).SetSourceActor( actor );
 void Magnifier::SetSourceActor(Actor actor)
 {
   GetImpl(*this).SetSourceActor( actor );

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index de6e4f0..7393a3a 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -77,7 +77,7 @@ static bool DoAction( BaseObject* object, const std::string& actionName, const P
     if( control )
     {
       // if cast succeeds there is an implementation so no need to check
     if( control )
     {
       // if cast succeeds there is an implementation so no need to check

-      Internal::GetImplementation( control ).OnAccessibilityActivated();
+      ret = Internal::GetImplementation( control ).OnAccessibilityActivated();

     }
   }
 
     }
   }
 


@@ -143,11 +143,6 @@ static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tra
       controlImpl.EnableGestureDetection( Gesture::LongPress );
       controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor );
     }
       controlImpl.EnableGestureDetection( Gesture::LongPress );
       controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor );
     }

-    else
-    {
-      // signalName does not match any signal
-      connected = false;
-    }

   }
   return connected;
 }
   }
   return connected;
 }


@@ -719,8 +714,9 @@ void Control::AccessibilityActivate()
   OnAccessibilityActivated();
 }
 
   OnAccessibilityActivated();
 }
 

-void Control::OnAccessibilityActivated()
+bool Control::OnAccessibilityActivated()

 {
 {

+  return false; // Accessibility activation is not handled by default

 }
 
 bool Control::OnAccessibilityPan(PanGesture gesture)
 }
 
 bool Control::OnAccessibilityPan(PanGesture gesture)

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 951a6b5..8ffcbda 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -437,8 +437,9 @@ public: // API for derived classes to override
    * @brief This method is called when the control is accessibility activated.
    *
    * Derived classes should override this to perform custom accessibility activation.
    * @brief This method is called when the control is accessibility activated.
    *
    * Derived classes should override this to perform custom accessibility activation.

+   * @return true if this control can perform accessibility activation.

    */
    */

-  virtual void OnAccessibilityActivated();
+  virtual bool OnAccessibilityActivated();

 
   /**
    * @brief This method should be overridden by deriving classes when they wish to respond the accessibility
 
   /**
    * @brief This method should be overridden by deriving classes when they wish to respond the accessibility