Revert "Revert "WheelEvent class pimpling""

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

diff --git a/dali/internal/window-system/common/event-handler.cpp b/dali/internal/window-system/common/event-handler.cpp
index 99f1796..3392797 100755 (executable)
--- a/dali/internal/window-system/common/event-handler.cpp
+++ b/dali/internal/window-system/common/event-handler.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -95,7 +95,7 @@ static uint32_t GetCurrentMilliSeconds(void)
 } // unnamed namespace
 #endif
 
-EventHandler::EventHandler( WindowRenderSurface* surface, DamageObserver& damageObserver )
+EventHandler::EventHandler( WindowBase* windowBase, DamageObserver& damageObserver )
 : mStyleMonitor( StyleMonitor::Get() ),
   mDamageObserver( damageObserver ),
   mAccessibilityAdaptor( AccessibilityAdaptor::Get() ),
@@ -103,22 +103,17 @@ EventHandler::EventHandler( WindowRenderSurface* surface, DamageObserver& damage
   mClipboard( Clipboard::Get() ),
   mPaused( false )
 {
-  if( surface )
-  {
-    WindowBase* windowBase = surface->GetWindowBase();
-
-    // Connect signals
-    windowBase->WindowDamagedSignal().Connect( this, &EventHandler::OnWindowDamaged );
-    windowBase->FocusChangedSignal().Connect( this, &EventHandler::OnFocusChanged );
-    windowBase->RotationSignal().Connect( this, &EventHandler::OnRotation );
-    windowBase->TouchEventSignal().Connect( this, &EventHandler::OnTouchEvent );
-    windowBase->WheelEventSignal().Connect( this, &EventHandler::OnWheelEvent );
-    windowBase->KeyEventSignal().Connect( this, &EventHandler::OnKeyEvent );
-    windowBase->SelectionDataSendSignal().Connect( this, &EventHandler::OnSelectionDataSend );
-    windowBase->SelectionDataReceivedSignal().Connect( this, &EventHandler::OnSelectionDataReceived );
-    windowBase->StyleChangedSignal().Connect( this, &EventHandler::OnStyleChanged );
-    windowBase->AccessibilitySignal().Connect( this, &EventHandler::OnAccessibilityNotification );
-  }
+  // Connect signals
+  windowBase->WindowDamagedSignal().Connect( this, &EventHandler::OnWindowDamaged );
+  windowBase->FocusChangedSignal().Connect( this, &EventHandler::OnFocusChanged );
+  windowBase->RotationSignal().Connect( this, &EventHandler::OnRotation );
+  windowBase->TouchEventSignal().Connect( this, &EventHandler::OnTouchEvent );
+  windowBase->WheelEventSignal().Connect( this, &EventHandler::OnWheelEvent );
+  windowBase->KeyEventSignal().Connect( this, &EventHandler::OnKeyEvent );
+  windowBase->SelectionDataSendSignal().Connect( this, &EventHandler::OnSelectionDataSend );
+  windowBase->SelectionDataReceivedSignal().Connect( this, &EventHandler::OnSelectionDataReceived );
+  windowBase->StyleChangedSignal().Connect( this, &EventHandler::OnStyleChanged );
+  windowBase->AccessibilitySignal().Connect( this, &EventHandler::OnAccessibilityNotification );
 }
 
 EventHandler::~EventHandler()
@@ -154,13 +149,11 @@ void EventHandler::OnTouchEvent( Integration::Point& point, uint32_t timeStamp )
   }
 }
 
-void EventHandler::OnWheelEvent( WheelEvent& wheelEvent )
+void EventHandler::OnWheelEvent( Integration::WheelEvent& wheelEvent )
 {
-  Integration::WheelEvent event( static_cast< Integration::WheelEvent::Type >(wheelEvent.type), wheelEvent.direction, wheelEvent.modifiers, wheelEvent.point, wheelEvent.z, wheelEvent.timeStamp );
-
   for ( ObserverContainer::iterator iter = mObservers.begin(), endIter = mObservers.end(); iter != endIter; ++iter )
   {
-    (*iter)->OnWheelEvent( event );
+    (*iter)->OnWheelEvent( wheelEvent );
   }
 }