[dali_2.3.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / focus-manager / keyboard-focus-manager.cpp

diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
index 45d0fbf..c710823 100644 (file)
--- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
+++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 
 // EXTERNAL INCLUDES
+#include <cstring> // for strcmp
 
 // INTERNAL INCLUDES
 
@@ -27,10 +28,8 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 KeyboardFocusManager::KeyboardFocusManager()
 {
 }
@@ -44,8 +43,8 @@ KeyboardFocusManager KeyboardFocusManager::Get()
   return Internal::KeyboardFocusManager::Get();
 }
 
-KeyboardFocusManager::KeyboardFocusManager(Internal::KeyboardFocusManager *impl)
-  : BaseHandle(impl)
+KeyboardFocusManager::KeyboardFocusManager(Internal::KeyboardFocusManager* impl)
+: BaseHandle(impl)
 {
 }
 
@@ -59,7 +58,7 @@ Actor KeyboardFocusManager::GetCurrentFocusActor()
   return GetImpl(*this).GetCurrentFocusActor();
 }
 
-bool KeyboardFocusManager::MoveFocus(Control::KeyboardFocusNavigationDirection direction)
+bool KeyboardFocusManager::MoveFocus(Control::KeyboardFocus::Direction direction)
 {
   return GetImpl(*this).MoveFocus(direction);
 }
@@ -106,6 +105,11 @@ Actor KeyboardFocusManager::GetFocusIndicatorActor()
   return GetImpl(*this).GetFocusIndicatorActor();
 }
 
+void KeyboardFocusManager::MoveFocusBackward()
+{
+  return GetImpl(*this).MoveFocusBackward();
+}
+
 KeyboardFocusManager::PreFocusChangeSignalType& KeyboardFocusManager::PreFocusChangeSignal()
 {
   return GetImpl(*this).PreFocusChangeSignal();
@@ -121,9 +125,9 @@ KeyboardFocusManager::FocusGroupChangedSignalType& KeyboardFocusManager::FocusGr
   return GetImpl(*this).FocusGroupChangedSignal();
 }
 
-KeyboardFocusManager::FocusedActorActivatedSignalType& KeyboardFocusManager::FocusedActorActivatedSignal()
+KeyboardFocusManager::FocusedActorEnterKeySignalType& KeyboardFocusManager::FocusedActorEnterKeySignal()
 {
-  return GetImpl(*this).FocusedActorActivatedSignal();
+  return GetImpl(*this).FocusedActorEnterKeySignal();
 }
 
 } // namespace Toolkit