Revert "[Tizen] Revert "Use touch consumed return to set whether we process a gesture...

[platform/core/uifw/dali-core.git] / dali / internal / event / events / event-processor.h

diff --git a/dali/internal/event/events/event-processor.h b/dali/internal/event/events/event-processor.h
index ebdb6a2..c9734d3 100644 (file)
--- a/dali/internal/event/events/event-processor.h
+++ b/dali/internal/event/events/event-processor.h
@@ -1,26 +1,28 @@
-#ifndef __DALI_INTERNAL_EVENT_PROCESSOR_H__
-#define __DALI_INTERNAL_EVENT_PROCESSOR_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef DALI_INTERNAL_EVENT_PROCESSOR_H
+#define DALI_INTERNAL_EVENT_PROCESSOR_H
+
+/*
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/events/touch-event-processor.h>
+#include <dali/internal/event/events/hover-event-processor.h>
 #include <dali/internal/event/events/key-event-processor.h>
-#include <dali/internal/event/events/mouse-wheel-event-processor.h>
+#include <dali/internal/event/events/wheel-event-processor.h>
 #include <dali/internal/common/message-buffer.h>
 
 namespace Dali
@@ -29,19 +31,18 @@ namespace Dali
 namespace Integration
 {
 struct Event;
-struct GestureEvent;
 }
 
 namespace Internal
 {
 
-class Stage;
+class Scene;
 class GestureEventProcessor;
 class NotificationManager;
 
 /**
  * The EventProcessor processes any events that are received by Dali.  Such events include
- * touch events, key events, mouse wheel events, and notification events.
+ * touch events, key events, wheel events, and notification events.
  *
  * When the EventProcessor receives an event, it determines its type and passes it on to the
  * appropriate processor.
@@ -52,11 +53,10 @@ public:
 
   /**
    * Constructor
-   * @param[in] stage                  The stage.
-   * @param[in] notificationManager    The Notification Manager.
+   * @param[in] scene                  The scene.
    * @param[in] gestureEventProcessor  The gesture event processor.
    */
-  EventProcessor(Stage& stage, NotificationManager& notificationManager, GestureEventProcessor& gestureEventProcessor);
+  EventProcessor( Scene& scene, GestureEventProcessor& gestureEventProcessor );
 
   /**
    * Destructor
@@ -66,29 +66,24 @@ public:
 public:
 
   /**
-   * This function is called by Core when an event is queued.
+   * This function is called when an event is queued.
    * @param[in] event A event to queue.
    */
   void QueueEvent( const Integration::Event& event );
 
   /**
-   * This function is called by Core when events are processed.
+   * This function is called when events are processed.
    */
   void ProcessEvents();
 
 private:
 
-  /**
-   * Helper for QueueEvent()
-   */
-  void QueueGestureEvent(const Integration::GestureEvent& event);
-
-private:
-
+  Scene& mScene;                                        ///< The Scene events are processed for.
   TouchEventProcessor      mTouchEventProcessor;        ///< Processes touch events.
+  HoverEventProcessor      mHoverEventProcessor;        ///< Processes hover events.
   GestureEventProcessor&   mGestureEventProcessor;      ///< Processes gesture events.
   KeyEventProcessor        mKeyEventProcessor;          ///< Processes key events.
-  MouseWheelEventProcessor mMouseWheelEventProcessor;   ///< Processes mouse wheel events.
+  WheelEventProcessor      mWheelEventProcessor;        ///< Processes wheel events.
 
   // Allow messages to be added safely to one queue, while processing (iterating through) the second queue.
   MessageBuffer mEventQueue0;        ///< An event queue.
@@ -100,5 +95,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EVENT_PROCESSOR_H__
+#endif // DALI_INTERNAL_EVENT_PROCESSOR_H