-#ifndef __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#ifndef DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
+#define DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
/*
* Copyright (c) 2019 Samsung Electronics Co., Ltd.
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
#include <dali/integration-api/events/touch-event-combiner.h>
// INTERNAL INCLUDES
bool IsEnabled() const;
/**
+ * @copydoc Dali::AccessibilityAdaptor::SetForcedEnable()
+ */
+ void SetForcedEnable( bool forced );
+
+ /**
+ * Whether the accessibility is enabled forcibly or not
+ */
+ bool IsForcedEnable() const;
+
+ /**
* @copydoc Dali::AccessibilityAdaptor::GetReadPosition() const
*/
Vector2 GetReadPosition() const;
void SetGestureHandler(AccessibilityGestureHandler& handler);
/**
+ * @copydoc Dali::AccessibilityAdaptor::SetFocusedActorPosition()
+ */
+ void SetFocusedActorPosition(Vector2 currentPosition);
+
+ /**
+ * @brief Returns the current position of the focused actor.
+ * @return The current position of the focused actor
+ */
+ Vector2 GetFocusedActorPosition() const;
+
+ /**
* @copydoc Dali::AccessibilityAdaptor::HandleActionNextEvent()
*/
virtual bool HandleActionNextEvent( bool allowEndFeedback = true);
bool HandleActionScrollEvent(const TouchPoint& point, uint32_t timeStamp);
/**
- * @copydoc Dali::AccessibilityAdaptor::HandleActionTouchEvent()
- */
- bool HandleActionTouchEvent(const TouchPoint& point, uint32_t timeStamp);
-
- /**
* @copydoc Dali::AccessibilityAdaptor::HandleActionBackEvent()
*/
bool HandleActionBackEvent();
/**
* Destructor.
*/
- virtual ~AccessibilityAdaptor();
+ ~AccessibilityAdaptor() override;
private:
Dali::Integration::TouchEventCombiner mCombiner; ///< Combines multi-touch events.
Vector2 mReadPosition; ///< ActionRead position
+ Vector2 mFocusedActorPosition; ///< Focused actor position
AccessibilityActionHandler* mActionHandler; ///< The pointer of accessibility action handler
bool mIsEnabled : 1; ///< enable/disable the accessibility action
+ bool mIsForced : 1; ///< Is the accessibility enabled forcibly
+
public:
// Helpers for public-api forwarding methods
} // namespace Dali
-#endif // __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#endif // DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H