From 0af6166d13835feea397eb1ba52044182a506ab3 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Fri, 26 Jun 2015 17:15:30 +0100 Subject: [PATCH] Added GetReadPosition to AccessibilityManager API As per request, re-added GetReadPosition to public API. Change-Id: I2dddbfa24f732856fd3f5a233498873d29687423 --- .../internal/accessibility-manager/accessibility-manager-impl.cpp | 6 ++++++ .../internal/accessibility-manager/accessibility-manager-impl.h | 5 +++++ .../public-api/accessibility-manager/accessibility-manager.cpp | 5 +++++ .../public-api/accessibility-manager/accessibility-manager.h | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp index 16e0c64..935e09f 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp @@ -553,6 +553,12 @@ Actor AccessibilityManager::GetFocusGroup(Actor actor) return actor; } +Vector2 AccessibilityManager::GetReadPosition() const +{ + AccessibilityAdaptor adaptor = AccessibilityAdaptor::Get(); + return adaptor.GetReadPosition(); +} + void AccessibilityManager::SetGroupMode(bool enabled) { mIsFocusWithinGroup = enabled; diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h index e37e319..1603a02 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h @@ -198,6 +198,11 @@ public: */ Actor GetFocusGroup(Actor actor); + /** + * @copydoc Toolkit::AccessibilityManager::GetReadPosition + */ + Vector2 GetReadPosition() const; + public: /** diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp index 0110ef7..79ab14d 100644 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp @@ -186,6 +186,11 @@ Actor AccessibilityManager::GetFocusGroup(Actor actor) return GetImpl(*this).GetFocusGroup(actor); } +Vector2 AccessibilityManager::GetReadPosition() const +{ + return GetImpl(*this).GetReadPosition(); +} + AccessibilityManager::FocusChangedSignalType& AccessibilityManager::FocusChangedSignal() { return GetImpl(*this).FocusChangedSignal(); diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h index 703d414..9f807ac 100644 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h @@ -375,6 +375,12 @@ public: */ Actor GetFocusGroup(Actor actor); + /** + * @brief Returns the current position of the read action. + * @return The current event position. + */ + Vector2 GetReadPosition() const; + public: // Signals /** -- 2.7.4