From f6d59da2a6174a7f353218fb8994cf932460b4e3 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Thu, 28 May 2015 13:26:56 +0100 Subject: [PATCH] Fixed Control and Magnifier API Change-Id: I0cdf52157b2c4633d0710b37666d1b714e816859 --- dali-toolkit/devel-api/controls/magnifier/magnifier.cpp | 5 +++++ dali-toolkit/public-api/controls/control-impl.cpp | 10 +++------- dali-toolkit/public-api/controls/control-impl.h | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp b/dali-toolkit/devel-api/controls/magnifier/magnifier.cpp index 6dd16d1..e51ee1e 100644 --- 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(handle); +} + 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 --- 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 - 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 ); } - else - { - // signalName does not match any signal - connected = false; - } } return connected; } @@ -719,8 +714,9 @@ void Control::AccessibilityActivate() OnAccessibilityActivated(); } -void Control::OnAccessibilityActivated() +bool Control::OnAccessibilityActivated() { + return false; // Accessibility activation is not handled by default } 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 --- 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. + * @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 -- 2.7.4