X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Ftizen-wayland%2Fecore-wl2%2Fwindow-base-ecore-wl2.cpp;h=c1b45346e18ca2ec5a88daabcc52a1a6b62336d6;hb=6e377250e5a3ceb88c231759b0e7d6da86939caf;hp=a4306c7d70ab12c479c7c7ecddca2466ccd8fa85;hpb=2573f2349456ef31c0df63d5f9cefeff5eb8b99f;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
old mode 100644
new mode 100755
index a4306c7..c1b4534
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -30,6 +30,7 @@
 
 // EXTERNAL_HEADERS
 #include <dali/public-api/object/any.h>
+#include <dali/public-api/events/mouse-button.h>
 #include <dali/integration-api/debug.h>
 #include <Ecore_Input.h>
 #include <vconf.h>
@@ -863,22 +864,25 @@ void WindowBaseEcoreWl2::OnMouseButtonDown( void* data, int type, void* event )
 
   if( touchEvent->window == static_cast< unsigned int >( ecore_wl2_window_id_get( mEcoreWindow ) ) )
   {
-    PointState::Type state ( PointState::DOWN );
-
-    // Check if the buttons field is set and ensure it's the primary touch button.
-    // If this event was triggered by buttons other than the primary button (used for touch), then
-    // just send an interrupted event to Core.
-    if( touchEvent->buttons && (touchEvent->buttons != PRIMARY_TOUCH_BUTTON_ID ) )
-    {
-      state = PointState::INTERRUPTED;
-    }
-
     Device::Class::Type deviceClass;
     Device::Subclass::Type deviceSubclass;
 
     GetDeviceClass( ecore_device_class_get( touchEvent->dev ), deviceClass );
     GetDeviceSubclass( ecore_device_subclass_get( touchEvent->dev ), deviceSubclass );
 
+    PointState::Type state ( PointState::DOWN );
+
+    if( deviceClass != Device::Class::Type::MOUSE )
+    {
+      // Check if the buttons field is set and ensure it's the primary touch button.
+      // If this event was triggered by buttons other than the primary button (used for touch), then
+      // just send an interrupted event to Core.
+      if( touchEvent->buttons && (touchEvent->buttons != PRIMARY_TOUCH_BUTTON_ID ) )
+      {
+        state = PointState::INTERRUPTED;
+      }
+    }
+
     Integration::Point point;
     point.SetDeviceId( touchEvent->multi.device );
     point.SetState( state );
@@ -888,6 +892,7 @@ void WindowBaseEcoreWl2::OnMouseButtonDown( void* data, int type, void* event )
     point.SetAngle( Degree( touchEvent->multi.angle ) );
     point.SetDeviceClass( deviceClass );
     point.SetDeviceSubclass( deviceSubclass );
+    point.SetMouseButton( static_cast< MouseButton::Type >( touchEvent->buttons) );
 
     mTouchEventSignal.Emit( point, touchEvent->timestamp );
   }
@@ -914,6 +919,7 @@ void WindowBaseEcoreWl2::OnMouseButtonUp( void* data, int type, void* event )
     point.SetAngle( Degree( touchEvent->multi.angle ) );
     point.SetDeviceClass( deviceClass );
     point.SetDeviceSubclass( deviceSubclass );
+    point.SetMouseButton( static_cast< MouseButton::Type >( touchEvent->buttons) );
 
     mTouchEventSignal.Emit( point, touchEvent->timestamp );
   }
@@ -1342,7 +1348,7 @@ bool WindowBaseEcoreWl2::IsEglWindowRotationSupported()
 
 void WindowBaseEcoreWl2::Move( PositionSize positionSize )
 {
-  ecore_wl2_window_geometry_set( mEcoreWindow, positionSize.x, positionSize.y, positionSize.width, positionSize.height );
+  ecore_wl2_window_position_set( mEcoreWindow, positionSize.x, positionSize.y );
 }
 
 void WindowBaseEcoreWl2::Resize( PositionSize positionSize )
@@ -1352,6 +1358,7 @@ void WindowBaseEcoreWl2::Resize( PositionSize positionSize )
 
 void WindowBaseEcoreWl2::MoveResize( PositionSize positionSize )
 {
+  ecore_wl2_window_position_set( mEcoreWindow, positionSize.x, positionSize.y );
   ecore_wl2_window_geometry_set( mEcoreWindow, positionSize.x, positionSize.y, positionSize.width, positionSize.height );
 }