Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / events / touch-data-impl.h

diff --git a/dali/internal/event/events/touch-data-impl.h b/dali/internal/event/events/touch-data-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index 1f53a11..5135e83
--- a/dali/internal/event/events/touch-data-impl.h
+++ b/dali/internal/event/events/touch-data-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TOUCH_DATA_H__
-#define __DALI_INTERNAL_TOUCH_DATA_H__
+#ifndef DALI_INTERNAL_TOUCH_DATA_H
+#define DALI_INTERNAL_TOUCH_DATA_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -158,19 +158,27 @@ public:
    */
   void AddPoint( const Integration::Point& point );
 
-    /**
+  /**
    * @brief Get the device class the mouse/touch event originated from
    *
    * @return The device class
    */
-  DevelDevice::Class::Type GetDeviceClass( std::size_t point ) const;
+  Device::Class::Type GetDeviceClass( std::size_t point ) const;
 
   /**
    * @brief Get the device subclass the mouse/touch event originated from
    *
    * @return The device subclass
    */
-  DevelDevice::Subclass::Type GetDeviceSubclass( std::size_t point ) const;
+  Device::Subclass::Type GetDeviceSubclass( std::size_t point ) const;
+
+  /**
+   * @brief Get mouse's button value (ex: right/left button)
+   *
+   * @return The value of mouse button
+   */
+  MouseButton::Type GetMouseButton( std::size_t point ) const;
+
 
 private:
 
@@ -210,4 +218,4 @@ inline const Internal::TouchData& GetImplementation( const Dali::TouchData& touc
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TOUCH_DATA_H__
+#endif // DALI_INTERNAL_TOUCH_DATA_H