*
*/
-#include "toolkit-accessibility-adaptor.h"
-
-#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/base-object.h>
+#include <dali/integration-api/events/pan-gesture-event.h>
+#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
namespace Dali
{
void MockSetReadPosition( Vector2& position );
+ void SetEnabled(bool enabled)
+ {
+ mIsEnabled = enabled;
+ }
+
+ void SendPanGesture( const Dali::Integration::PanGestureEvent& panEvent );
+
public:
bool IsEnabled() const;
Vector2 GetReadPosition() const;
- bool HandleActionNextEvent();
- bool HandleActionPreviousEvent();
+ bool HandleActionNextEvent(bool);
+ bool HandleActionPreviousEvent(bool);
bool HandleActionActivateEvent();
bool HandleActionReadEvent(unsigned int x, unsigned int y, bool allowReadAgain);
- bool HandleActionReadNextEvent();
- bool HandleActionReadPreviousEvent();
+ bool HandleActionReadNextEvent(bool);
+ bool HandleActionReadPreviousEvent(bool);
bool HandleActionUpEvent();
bool HandleActionDownEvent();
bool HandleActionClearFocusEvent();
- bool HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp);
+ bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
+ bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
bool HandleActionBackEvent();
bool HandleActionEnableEvent();
bool HandleActionDisableEvent();
bool HandleActionReadFromTopEvent();
bool HandleActionReadFromNextEvent();
bool HandleActionZoomEvent();
- bool HandleActionReadIndicatorInformationEvent();
bool HandleActionReadPauseResumeEvent();
bool HandleActionStartStopEvent();
-public: // Signals
-
private:
bool mIsEnabled;
AccessibilityAdaptor::AccessibilityAdaptor()
: mIsEnabled(false),
+ mActionHandler(NULL),
+ mGestureHandler(NULL),
mReadPosition( 0.0f, 0.0f )
{
}
return mIsEnabled;
}
+void AccessibilityAdaptor::SendPanGesture( const Integration::PanGestureEvent& panEvent )
+{
+ mGestureHandler->HandlePanGesture( panEvent );
+}
+
void AccessibilityAdaptor::SetActionHandler(Dali::AccessibilityActionHandler& handler)
{
mActionHandler = &handler;
mGestureHandler = &handler;
}
-bool AccessibilityAdaptor::HandleActionNextEvent()
+bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
{
if( mActionHandler )
{
return false;
}
-bool AccessibilityAdaptor::HandleActionPreviousEvent()
+bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback)
{
if( mActionHandler )
{
return false;
}
-bool AccessibilityAdaptor::HandleActionReadNextEvent()
+bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback)
{
if( mActionHandler )
{
return false;
}
-bool AccessibilityAdaptor::HandleActionReadPreviousEvent()
+bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback)
{
if( mActionHandler )
{
return false;
}
-bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
{
if( mActionHandler )
{
return false;
}
+bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
+{
+ if( mActionHandler )
+ {
+ Dali::TouchEvent touchEvent;
+ touchEvent.points.push_back( point );
+ return mActionHandler->AccessibilityActionTouch( touchEvent );
+ }
+ return false;
+}
+
bool AccessibilityAdaptor::HandleActionBackEvent()
{
if( mActionHandler )
return false;
}
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
- if( mActionHandler )
- {
- return mActionHandler->AccessibilityActionReadIndicatorInformation();
- }
- return false;
-}
-
bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
{
if( mActionHandler )
return static_cast<Internal::Adaptor::AccessibilityAdaptor&>(handle);
}
+static const Internal::Adaptor::AccessibilityAdaptor& GetImplementation(const Dali::AccessibilityAdaptor& adaptor)
+{
+ const BaseObject& handle = adaptor.GetBaseObject();
+ return static_cast<const Internal::Adaptor::AccessibilityAdaptor&>(handle);
+}
+
} // namespace Adaptor
} // namespace Internal
{
}
-// Mock setup:
-
-void AccessibilityAdaptor::MockSetReadPosition( Vector2& position )
-{
- Internal::Adaptor::GetImplementation(*this).MockSetReadPosition( position );
-}
-
// Methods:
-Vector2 AccessibilityAdaptor::GetReadPosition()
+Vector2 AccessibilityAdaptor::GetReadPosition() const
{
return Internal::Adaptor::GetImplementation(*this).GetReadPosition();
}
bool AccessibilityAdaptor::IsEnabled() const
{
- //return Internal::Adaptor::GetImplementation(*this).IsEnabled();
- return false;
+ return Internal::Adaptor::GetImplementation(*this).IsEnabled();
}
void AccessibilityAdaptor::SetActionHandler(AccessibilityActionHandler& handler)
Internal::Adaptor::GetImplementation(*this).SetGestureHandler(handler);
}
-bool AccessibilityAdaptor::HandleActionNextEvent()
+bool AccessibilityAdaptor::HandleActionNextEvent(bool allowEndFeedback)
{
- return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent();
+ return Internal::Adaptor::GetImplementation(*this).HandleActionNextEvent(allowEndFeedback);
}
-bool AccessibilityAdaptor::HandleActionPreviousEvent()
+bool AccessibilityAdaptor::HandleActionPreviousEvent(bool allowEndFeedback)
{
- return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent();
+ return Internal::Adaptor::GetImplementation(*this).HandleActionPreviousEvent(allowEndFeedback);
}
bool AccessibilityAdaptor::HandleActionActivateEvent()
return Internal::Adaptor::GetImplementation(*this).HandleActionReadEvent( x, y, allowReadAgain );
}
-bool AccessibilityAdaptor::HandleActionReadNextEvent()
+bool AccessibilityAdaptor::HandleActionReadNextEvent(bool allowEndFeedback)
{
- return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent();
+ return Internal::Adaptor::GetImplementation(*this).HandleActionReadNextEvent(allowEndFeedback);
}
-bool AccessibilityAdaptor::HandleActionReadPreviousEvent()
+bool AccessibilityAdaptor::HandleActionReadPreviousEvent(bool allowEndFeedback)
{
- return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent();
+ return Internal::Adaptor::GetImplementation(*this).HandleActionReadPreviousEvent(allowEndFeedback);
}
bool AccessibilityAdaptor::HandleActionUpEvent()
return Internal::Adaptor::GetImplementation(*this).HandleActionClearFocusEvent();
}
-bool AccessibilityAdaptor::HandleActionScrollEvent(TouchPoint& point, unsigned long timeStamp)
+bool AccessibilityAdaptor::HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp)
{
return Internal::Adaptor::GetImplementation(*this).HandleActionScrollEvent(point, timeStamp);
}
+bool AccessibilityAdaptor::HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp)
+{
+ return Internal::Adaptor::GetImplementation(*this).HandleActionTouchEvent(point, timeStamp);
+}
+
bool AccessibilityAdaptor::HandleActionBackEvent()
{
return Internal::Adaptor::GetImplementation(*this).HandleActionBackEvent();
return Internal::Adaptor::GetImplementation(*this).HandleActionZoomEvent();
}
-bool AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
-{
- return Internal::Adaptor::GetImplementation(*this).HandleActionReadIndicatorInformationEvent();
-}
-
bool AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
{
return Internal::Adaptor::GetImplementation(*this).HandleActionReadPauseResumeEvent();
}
} // namespace Dali
+
+
+namespace Test
+{
+namespace AccessibilityAdaptor
+{
+
+// Mock setup:
+
+void MockSetReadPosition( Dali::AccessibilityAdaptor adaptor, Dali::Vector2& position )
+{
+ Dali::Internal::Adaptor::GetImplementation(adaptor).MockSetReadPosition( position );
+}
+
+void SetEnabled( Dali::AccessibilityAdaptor adaptor, bool enabled )
+{
+ Dali::Internal::Adaptor::GetImplementation(adaptor).SetEnabled(enabled);
+}
+
+void SendPanGesture( Dali::AccessibilityAdaptor adaptor, const Dali::Integration::PanGestureEvent& panEvent )
+{
+ Dali::Internal::Adaptor::GetImplementation(adaptor).SendPanGesture( panEvent );
+}
+
+} // namespace AccessibilityAdaptor
+} // namespace Test