Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / event-handler.h

diff --git a/dali/internal/window-system/common/event-handler.h b/dali/internal/window-system/common/event-handler.h
old mode 100755 (executable)
new mode 100644 (file)
index 96d6283..71f4ca5
--- a/dali/internal/window-system/common/event-handler.h
+++ b/dali/internal/window-system/common/event-handler.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_EVENT_HANDLER_H
 
 /*
- * Copyright (c) 2019 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.
@@ -22,20 +22,14 @@
 #include <cstdint> // uint32_t
 #include <dali/public-api/common/intrusive-ptr.h>
 
-#include <dali/integration-api/events/key-event-integ.h>
-#include <dali/integration-api/events/point.h>
-#include <dali/integration-api/events/touch-event-combiner.h>
-#include <dali/integration-api/scene.h>
 #include <dali/devel-api/adaptor-framework/clipboard.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
-#include <dali/devel-api/adaptor-framework/clipboard.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/window-system/common/damage-observer.h>
+#include <dali/internal/accessibility/common/accessibility-adaptor-impl.h>
 #include <dali/internal/clipboard/common/clipboard-event-notifier-impl.h>
 #include <dali/internal/window-system/common/damage-observer.h>
 #include <dali/internal/window-system/common/window-base.h>
-#include <dali/internal/system/common/core-event-interface.h>
 
 namespace Dali
 {
@@ -125,7 +119,7 @@ public:
   /**
    * Destructor.
    */
-  ~EventHandler();
+  ~EventHandler() override;
 
   /**
    * Called when the adaptor is paused.
@@ -172,7 +166,7 @@ private:
   /**
    * Called when a mouse wheel is received.
    */
-  void OnWheelEvent( WheelEvent& wheelEvent );
+  void OnWheelEvent( Integration::WheelEvent& wheelEvent );
 
   /**
    * Called when a key event is received.
@@ -210,6 +204,11 @@ private:
    */
   void OnStyleChanged( StyleChange::Type styleChange );
 
+  /**
+   * Called when Ecore ElDBus accessibility event is received.
+   */
+  void OnAccessibilityNotification( const WindowBase::AccessibilityInfo& info );
+
 private:
 
   // Undefined
@@ -223,6 +222,7 @@ private:
   Dali::StyleMonitor mStyleMonitor; ///< Handle to the style monitor, set on construction, to send font size and font change events to.
   DamageObserver& mDamageObserver; ///< Reference to the DamageObserver, set on construction, to sent damage events to.
 
+  Dali::AccessibilityAdaptor mAccessibilityAdaptor; ///< Pointer to the accessibility adaptor
   Dali::ClipboardEventNotifier mClipboardEventNotifier; ///< Pointer to the clipboard event notifier
   Dali::Clipboard mClipboard;///< Pointer to the clipboard