Merge "Clean up the code to build successfully on macOS" into devel/master

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

diff --git a/dali/internal/event/events/wheel-event-processor.cpp b/dali/internal/event/events/wheel-event-processor.cpp
index d2a7645..216102c 100644 (file)
--- a/dali/internal/event/events/wheel-event-processor.cpp
+++ b/dali/internal/event/events/wheel-event-processor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -26,6 +26,7 @@
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/common/scene-impl.h>
 #include <dali/internal/event/events/hit-test-algorithm-impl.h>
+#include <dali/internal/event/events/wheel-event-impl.h>
 
 namespace Dali
 {
@@ -43,7 +44,7 @@ Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_WHE
 /**
  *  Recursively deliver events to the actor and its parents, until the event is consumed or the stage is reached.
  */
-Dali::Actor EmitWheelSignals( Dali::Actor actor, const WheelEvent& event )
+Dali::Actor EmitWheelSignals( Dali::Actor actor, const Dali::WheelEvent& event )
 {
   Dali::Actor consumedActor;
 
@@ -127,15 +128,14 @@ WheelEventProcessor::WheelEventProcessor( Scene& scene )
 {
 }
 
-WheelEventProcessor::~WheelEventProcessor()
-{
-}
+WheelEventProcessor::~WheelEventProcessor() = default;
 
 void WheelEventProcessor::ProcessWheelEvent( const Integration::WheelEvent& event )
 {
-  WheelEvent wheelEvent( static_cast< WheelEvent::Type >( event.type ), event.direction, event.modifiers, event.point, event.z, event.timeStamp );
+  WheelEventPtr wheelEvent = WheelEvent::New( static_cast< Dali::WheelEvent::Type >( event.type ), event.direction, event.modifiers, event.point, event.delta, event.timeStamp );
+  Dali::WheelEvent wheelEventHandle( wheelEvent.Get() );
 
-  if( wheelEvent.type == WheelEvent::MOUSE_WHEEL )
+  if( wheelEvent->GetType() == Dali::WheelEvent::MOUSE_WHEEL )
   {
     Dali::HitTestAlgorithm::Results hitTestResults;
     HitTestAlgorithm::HitTest( mScene.GetSize(), mScene.GetRenderTaskList(), mScene.GetLayerList(), event.point, hitTestResults, IsActorWheelableFunction );
@@ -147,7 +147,7 @@ void WheelEventProcessor::ProcessWheelEvent( const Integration::WheelEvent& even
                    hitTestResults.actorCoordinates.x, hitTestResults.actorCoordinates.y );
 
     // Recursively deliver events to the actor and its parents, until the event is consumed or the stage is reached.
-    Dali::Actor consumedActor = EmitWheelSignals( hitTestResults.actor, wheelEvent );
+    Dali::Actor consumedActor = EmitWheelSignals( hitTestResults.actor, wheelEventHandle );
 
     DALI_LOG_INFO( gLogFilter, Debug::Concise, "HitActor:      (%p) %s\n", hitTestResults.actor ? reinterpret_cast< void* >( &hitTestResults.actor.GetBaseObject() ) : NULL, hitTestResults.actor ? hitTestResults.actor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() : "" );
     DALI_LOG_INFO( gLogFilter, Debug::Concise, "ConsumedActor: (%p) %s\n", consumedActor ? reinterpret_cast< void* >( &consumedActor.GetBaseObject() ) : NULL, consumedActor ? consumedActor.GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() : "" );
@@ -155,7 +155,7 @@ void WheelEventProcessor::ProcessWheelEvent( const Integration::WheelEvent& even
   else
   {
     // if CUSTOM_WHEEL, emit the wheel event signal from the scene.
-    mScene.EmitWheelEventSignal( wheelEvent );
+    mScene.EmitWheelEventSignal( wheelEventHandle );
   }
 }