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

[platform/core/uifw/dali-core.git] / dali / integration-api / events / point.cpp

diff --git a/dali/integration-api/events/point.cpp b/dali/integration-api/events/point.cpp
index 19b44b0..ebba967 100644 (file)
--- a/dali/integration-api/events/point.cpp
+++ b/dali/integration-api/events/point.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.
@@ -17,71 +17,70 @@
 
 // CLASS HEADER
 #include <dali/integration-api/events/point.h>
+#include <dali/public-api/events/mouse-button.h>
 
 namespace Dali
 {
-
 namespace Integration
 {
-
 Point::Point()
-: mTouchPoint( 0, TouchPoint::Started, 0.0f, 0.0f ),
+: mTouchPoint(0, PointState::STARTED, 0.0f, 0.0f),
   mEllipseRadius(),
-  mAngle( 0.0f ),
-  mDeviceClass( Device::Class::NONE ),
-  mDeviceSubclass( Device::Subclass::NONE ),
-  mPressure( 1.0f ),
-  mRadius( 0.0f )
+  mAngle(0.0f),
+  mDeviceClass(Device::Class::NONE),
+  mDeviceSubclass(Device::Subclass::NONE),
+  mPressure(1.0f),
+  mRadius(0.0f),
+  mMouseButton(MouseButton::INVALID)
 {
 }
 
-Point::Point( const TouchPoint& touchPoint )
-: mTouchPoint( touchPoint ),
+Point::Point(const TouchPoint& touchPoint)
+: mTouchPoint(touchPoint),
   mEllipseRadius(),
-  mAngle( 0.0f ),
-  mDeviceClass( Device::Class::NONE ),
-  mDeviceSubclass( Device::Subclass::NONE ),
-  mPressure( 1.0f ),
-  mRadius( 0.0f )
+  mAngle(0.0f),
+  mDeviceClass(Device::Class::NONE),
+  mDeviceSubclass(Device::Subclass::NONE),
+  mPressure(1.0f),
+  mRadius(0.0f),
+  mMouseButton(MouseButton::INVALID)
 {
 }
 
-Point::~Point()
-{
-}
+Point::~Point() = default;
 
-void Point::SetDeviceId( int deviceId )
+void Point::SetDeviceId(int32_t deviceId)
 {
   mTouchPoint.deviceId = deviceId;
 }
 
-void Point::SetState( PointState::Type state )
+void Point::SetState(PointState::Type state)
 {
-  mTouchPoint.state = static_cast< TouchPoint::State >( state );
+  mTouchPoint.state = static_cast<PointState::Type>(state);
 }
 
-void Point::SetScreenPosition( const Vector2& screenPosition )
+void Point::SetScreenPosition(const Vector2& screenPosition)
 {
   mTouchPoint.screen = screenPosition;
 }
 
-void Point::SetRadius( float radius )
+void Point::SetRadius(float radius)
 {
   mRadius = mEllipseRadius.x = mEllipseRadius.y = radius;
 }
 
-void Point::SetRadius( float radius, Vector2 ellipseRadius )
+void Point::SetRadius(float radius, Vector2 ellipseRadius)
 {
-  mRadius = radius;
+  mRadius        = radius;
   mEllipseRadius = ellipseRadius;
 }
 
-void Point::SetPressure( float pressure )
+void Point::SetPressure(float pressure)
 {
   mPressure = pressure;
 }
 
-void Point::SetAngle( Degree angle )
+void Point::SetAngle(Degree angle)
 {
   mAngle = angle;
 }
@@ -93,7 +92,7 @@ int Point::GetDeviceId() const
 
 PointState::Type Point::GetState() const
 {
-  return static_cast< PointState::Type >( mTouchPoint.state );
+  return static_cast<PointState::Type>(mTouchPoint.state);
 }
 
 const Vector2& Point::GetScreenPosition() const
@@ -121,12 +120,12 @@ Degree Point::GetAngle() const
   return mAngle;
 }
 
-void Point::SetHitActor( Actor hitActor )
+void Point::SetHitActor(Actor hitActor)
 {
   mTouchPoint.hitActor = hitActor;
 }
 
-void Point::SetLocalPosition( const Vector2& localPosition )
+void Point::SetLocalPosition(const Vector2& localPosition)
 {
   mTouchPoint.local = localPosition;
 }
@@ -146,12 +145,12 @@ const TouchPoint& Point::GetTouchPoint() const
   return mTouchPoint;
 }
 
-void Point::SetDeviceClass( Device::Class::Type deviceClass )
+void Point::SetDeviceClass(Device::Class::Type deviceClass)
 {
   mDeviceClass = deviceClass;
 }
 
-void Point::SetDeviceSubclass( Device::Subclass::Type deviceSubclass )
+void Point::SetDeviceSubclass(Device::Subclass::Type deviceSubclass)
 {
   mDeviceSubclass = deviceSubclass;
 }
@@ -166,6 +165,16 @@ Device::Subclass::Type Point::GetDeviceSubclass() const
   return mDeviceSubclass;
 }
 
+MouseButton::Type Point::GetMouseButton() const
+{
+  return mMouseButton;
+}
+
+void Point::SetMouseButton(MouseButton::Type button)
+{
+  mMouseButton = button;
+}
+
 } // namespace Integration
 
 } // namespace Dali