Change TouchEvent and WheelEvent

In dali2, Touch&Wheel Event is changed.
so i apply it to widget_viewer_dali

Change-Id: I319627ec29b69c36685ee0ad2d1df97f5ae3dd50

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index e517129317d8097c00eb5f06d7e09f89ab363cf9..ea4414aa17ec7c0d8677a730b0dff59fce6e64c1 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -22,7 +22,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/stage.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/key-event.h>
 #include <dali/public-api/events/wheel-event.h>
 #include <dali/public-api/object/type-registry.h>
@@ -1134,7 +1134,7 @@ void WidgetView::ConnectSignal( tizen_remote_surface* surface )
   }
 }
 
-bool WidgetView::OnTouch( Dali::Actor actor, const Dali::TouchData& event )
+bool WidgetView::OnTouch( Dali::Actor actor, const Dali::TouchEvent& event )
 {
   if( event.GetPointCount() == 0 )
   {
@@ -1167,12 +1167,12 @@ bool WidgetView::OnWheelEvent( Dali::Actor actor, const Dali::WheelEvent& event
   }
   //ToDo: We should check TIZEN_INPUT_DEVICE_CLAS_MOUSE
   tizen_remote_surface_transfer_mouse_wheel( mRemoteSurface,
-                                             event.direction,
-                                             event.z,
+                                             event.GetDirection(),
+                                             event.GetDelta(),
                                              TIZEN_INPUT_DEVICE_CLAS_MOUSE,
                                              TIZEN_INPUT_DEVICE_SUBCLAS_NONE,
                                              "",
-                                             event.timeStamp
+                                             event.GetTime()
                                            );
   return false;
 }
@@ -1434,7 +1434,7 @@ float WidgetView::TextPixelToPointSize( int pixelSize )
   return (pixelSize * 72.0f) / meanDpi;
 }
 
-void WidgetView::MouseIn( const Dali::TouchData& event )
+void WidgetView::MouseIn( const Dali::TouchEvent& event )
 {
   Vector2 localPos = event.GetLocalPosition( 0 );
 
@@ -1455,7 +1455,7 @@ void WidgetView::MouseIn( const Dali::TouchData& event )
                                            );
 }
 
-void WidgetView::MouseOut( const Dali::TouchData& event )
+void WidgetView::MouseOut( const Dali::TouchEvent& event )
 {
   tizen_remote_surface_transfer_mouse_event( mRemoteSurface,
                                              TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_OUT,
@@ -1474,7 +1474,7 @@ void WidgetView::MouseOut( const Dali::TouchData& event )
                                            );
 }
 
-bool WidgetView::MouseEvent( const Dali::TouchData& event )
+bool WidgetView::MouseEvent( const Dali::TouchEvent& event )
 {
   tizen_remote_surface_event_type type = TIZEN_REMOTE_SURFACE_EVENT_TYPE_NONE;
   int button = 1;
@@ -1538,7 +1538,7 @@ bool WidgetView::MouseEvent( const Dali::TouchData& event )
   return true;
 }
 
-bool WidgetView::TouchEvent( const Dali::TouchData& event )
+bool WidgetView::TouchEvent( const Dali::TouchEvent& event )
 {
   tizen_remote_surface_event_type type = TIZEN_REMOTE_SURFACE_EVENT_TYPE_NONE;
   int button = 1;

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
index 04d86d4de6d356e12dea26ed3bb715e250c88a61..56729899344c5504087ce709b2c39c5527165820 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -143,7 +143,7 @@ public: // Internal API
 
   void ConnectSignal( tizen_remote_surface* surface );
 
-  bool OnTouch( Dali::Actor actor, const Dali::TouchData& event );
+  bool OnTouch( Dali::Actor actor, const Dali::TouchEvent& event );
 
   bool OnWheelEvent( Dali::Actor actor, const Dali::WheelEvent& event );
 
@@ -163,13 +163,13 @@ public: // Internal API
 
   bool TerminateWidget();
 
-  void MouseIn( const Dali::TouchData& event );
+  void MouseIn( const Dali::TouchEvent& event );
 
-  void MouseOut( const Dali::TouchData& event );
+  void MouseOut( const Dali::TouchEvent& event );
 
-  bool MouseEvent( const Dali::TouchData& event );
+  bool MouseEvent( const Dali::TouchEvent& event );
 
-  bool TouchEvent( const Dali::TouchData& event );
+  bool TouchEvent( const Dali::TouchEvent& event );
 
   void UpdateBuffer( struct tizen_remote_surface *surface, struct wl_buffer *buffer, int32_t fd);