From cd224fa3b170c7cab0f4033e751bf4211e9c84f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= <a.swigon@samsung.com>
Date: Tue, 8 Sep 2020 18:29:34 +0200
Subject: [PATCH] [AT-SPI] Support gaining keyboard focus in TextField,
 TextEditor

Change-Id: If52491ec863ba705fea8775bce0f44c70522e32e
---
 dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp | 6 ++++++
 dali-toolkit/internal/controls/text-controls/text-editor-impl.h   | 5 +++++
 dali-toolkit/internal/controls/text-controls/text-field-impl.cpp  | 6 ++++++
 dali-toolkit/internal/controls/text-controls/text-field-impl.h    | 5 +++++
 4 files changed, 22 insertions(+)

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index c28f3d5..5aa9ce2 100644
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1471,6 +1471,12 @@ void TextEditor::OnKeyInputFocusLost()
   EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last.
 }
 
+bool TextEditor::OnAccessibilityActivated()
+{
+  SetKeyInputFocus();
+  return true;
+}
+
 void TextEditor::OnTap( const TapGesture& gesture )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnTap %p\n", mController.Get() );
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..5d0df97 100755
--- 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;
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index b452c14..0c9f544 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1536,6 +1536,12 @@ void TextField::OnKeyInputFocusLost()
   EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last.
 }
 
+bool TextField::OnAccessibilityActivated()
+{
+  SetKeyInputFocus();
+  return true;
+}
+
 void TextField::OnTap( const TapGesture& gesture )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnTap %p\n", mController.Get() );
diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.h b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index 6b2d419..157e832 100755
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@ -144,6 +144,11 @@ private: // From Control
   void OnKeyInputFocusLost() override;
 
   /**
+   * @copydoc Control::OnAccessibilityActivated()
+   */
+  bool OnAccessibilityActivated() override;
+
+  /**
    * @copydoc Control::OnTap()
    */
   void OnTap( const TapGesture& tap ) override;
-- 
2.7.4