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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / focus-manager / keyinput-focus-manager.h

diff --git a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h
index 6240350..856f4e3 100644 (file)
--- a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h
+++ b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__
-#define __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__
+#ifndef DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H
+#define DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H
 
 /*
- * Copyright (c) 2015 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.
@@ -23,10 +23,8 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 class KeyInputFocusManager;
@@ -41,23 +39,17 @@ class KeyInputFocusManager;
  * UnhandledKeyEventSignal() is emitted.
  *
  * Signals
- * | %Signal Name            | Method                            |
- * |-------------------------|-----------------------------------|
- * | key-input-focus-changed | @ref KeyInputFocusChangedSignal() |
- * | unhandled-key-event     | @ref UnhandledKeyEventSignal()    |
+ * | %Signal Name         | Method                            |
+ * |----------------------|-----------------------------------|
+ * | keyInputFocusChanged | @ref KeyInputFocusChangedSignal() |
  */
-class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle
+class DALI_TOOLKIT_API KeyInputFocusManager : public BaseHandle
 {
 public:
-
   // KeyInputFocusChanged
-  typedef Signal< void (Control, Control) > KeyInputFocusChangedSignalType;
-
-  // Unhandled Key Event
-  typedef Signal< void (const KeyEvent&) > UnhandledKeyEventSignalType;
+  typedef Signal<void(Control, Control)> KeyInputFocusChangedSignalType;
 
 public:
-
   /**
    * Create a KeyInputFocusManager handle; this can be initialised with KeyInputFocusManager::Get()
    * Calling member functions with an uninitialised handle is not allowed.
@@ -103,15 +95,7 @@ public:
    */
   void RemoveFocus(Control control);
 
-  /**
-   * Queries whether a control is currently part of the focus stack.
-   * @param [in] control which should be queried.
-   * @return True if it is part of the foucus stack False otherwise.
-   */
-  bool IsKeyboardListener(Control control);
-
 public: // Signals
-
   /**
    * This signal is emitted when the key input focus control changes.
    * Two control parameters are sent as part of this signal, the first being the signal that now has the focus, the second
@@ -124,19 +108,8 @@ public: // Signals
    */
   KeyInputFocusChangedSignalType& KeyInputFocusChangedSignal();
 
-  /**
-   * This signal is emitted when a key event was received, and none of the focused controls on the stage have consumed it.
-   * A callback of the following type may be connected:
-   * @code
-   *   void YourCallbackName(const KeyEvent& event);
-   * @endcode
-   * @return The signal to connect to.
-   */
-  UnhandledKeyEventSignalType& UnhandledKeyEventSignal();
-
 private:
-
-  explicit DALI_INTERNAL KeyInputFocusManager(Internal::KeyInputFocusManager *impl);
+  explicit DALI_INTERNAL KeyInputFocusManager(Internal::KeyInputFocusManager* impl);
 
 }; // class KeyInputFocusManager
 
@@ -144,4 +117,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__
+#endif // DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H