Merge "[dali-toolkit] TextEditor/TextField add PrimaryCursorPosition property Add...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-editor-impl.h

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index d5603b0..c2385a2 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -152,6 +152,11 @@ private: // From Control
   void OnKeyInputFocusLost() override;
 
   /**
+   * @copydoc Control::OnAccessibilityActivated()
+   */
+  bool OnAccessibilityActivated() override;
+
+  /**
    * @copydoc Control::OnTap()
    */
   void OnTap( const TapGesture& tap ) override;
@@ -243,6 +248,25 @@ public:
   void SelectNone() override;
 
   /**
+   * @copydoc Dali::Toolkit::DevelTextEditor::ScrollBy()
+   */
+  void ScrollBy(Vector2 Scroll);
+
+  /**
+   * @brief Get Horizontal scroll position of TextEditor.
+   *
+   * @return Horizontal scroll position (in pixels) of TextEditor.
+   */
+  float GetHorizontalScrollPosition();
+
+  /**
+   * @brief Get Vertical scroll position of TextEditor.
+   *
+   * @return Vertical scroll position (in pixels) of TextEditor.
+   */
+  float GetVerticalScrollPosition();
+
+  /**
    * @copydoc Text::SelectableControlInterface::GetSelectedText()
    */
   string GetSelectedText() const override;