change KeyEvent

Change-Id: I155d110cfe972d388ecba5d8d8928a6e7c68046e

diff --git a/watch_viewer_dali/internal/watch_view/watch_view_impl.cpp b/watch_viewer_dali/internal/watch_view/watch_view_impl.cpp
index bf6dae727248d37d70873bb04a91f698c9fd8130..1d29feef5519fa328ceab29836006131951f4461 100644 (file)
--- a/watch_viewer_dali/internal/watch_view/watch_view_impl.cpp
+++ b/watch_viewer_dali/internal/watch_view/watch_view_impl.cpp
@@ -110,7 +110,7 @@ Dali::WatchView::WatchView WatchView::New( Window window, const std::string& wat
 
 WatchView::WatchView()
 : WatchHolderBase( 0, 0 ),
-  Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),
+  Control( ControlBehaviour() ),
   mContentInfo(),
   mWidth( 0 ),
   mHeight( 0 ),
@@ -122,7 +122,7 @@ WatchView::WatchView()
 
 WatchView::WatchView( Window window, const std::string& watchId, const std::string& contentInfo, int width, int height)
 : WatchHolderBase( width, height ),
-  Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),
+  Control( ControlBehaviour() ),
   mWatchId( watchId ),
   mContentInfo( contentInfo ),
   mWidth( width ),

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 8466031b8f86693d4984e65db502c7b841d08e0b..031d4762982881a0e7f84ad99689d60793eeef83 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -288,7 +288,7 @@ Dali::WidgetView::WidgetView WidgetView::New( const std::string& widgetId, const
 }
 
 WidgetView::WidgetView()
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),
+: Control( ControlBehaviour() ),
   mWidgetId(),
   mInstanceId(),
   mContentInfo(),
@@ -314,7 +314,7 @@ WidgetView::WidgetView()
 }
 
 WidgetView::WidgetView( const std::string& widgetId, const std::string& contentInfo, int width, int height, float updatePeriod )
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ),
+: Control( ControlBehaviour() ),
   mWidgetId( widgetId ),
   mInstanceId(),
   mContentInfo( contentInfo ),
@@ -1129,7 +1129,7 @@ void WidgetView::ConnectSignal( tizen_remote_surface* surface )
   {
     mRemoteSurface = surface;
 
-    Self().TouchSignal().Connect( this, &WidgetView::OnTouch );
+    Self().TouchedSignal().Connect( this, &WidgetView::OnTouch );
     Self().WheelEventSignal().Connect( this, &WidgetView::OnWheelEvent );
   }
 }
@@ -1186,22 +1186,18 @@ bool WidgetView::OnKeyEvent( const Dali::KeyEvent& event )
 
   tizen_remote_surface_event_type type = TIZEN_REMOTE_SURFACE_EVENT_TYPE_NONE;
 
-  switch( event.state )
+  switch( event.GetState() )
   {
-    case Dali::KeyEvent::Down:
+    case Dali::KeyEvent::DOWN:
     {
       type = TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_DOWN;
       break;
     }
-    case Dali::KeyEvent::Up:
+    case Dali::KeyEvent::UP:
     {
       type = TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_UP;
       break;
     }
-    case Dali::KeyEvent::Last:
-    {
-      break;
-    }
     default:
     {
       return false;
@@ -1209,7 +1205,7 @@ bool WidgetView::OnKeyEvent( const Dali::KeyEvent& event )
   }
 
   int32_t keyCode;
-  if( GetKeyCode( event.keyPressedName, keyCode ) == false )
+  if( GetKeyCode( event.GetKeyString(), keyCode ) == false )
   {
     return false;
   }
@@ -1220,7 +1216,7 @@ bool WidgetView::OnKeyEvent( const Dali::KeyEvent& event )
                                            event.GetDeviceClass(),
                                            event.GetDeviceSubclass(),
                                            "",
-                                           static_cast< uint32_t >( event.time )
+                                           static_cast< uint32_t >( event.GetTime() )
                                          );
 
   return false;