projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add GetMouseButton to identify right/left mouse button click
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
events
/
touch-data-impl.cpp
diff --git
a/dali/internal/event/events/touch-data-impl.cpp
b/dali/internal/event/events/touch-data-impl.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
678829d
..
481407a
--- a/
dali/internal/event/events/touch-data-impl.cpp
+++ b/
dali/internal/event/events/touch-data-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-159,22
+159,31
@@
void TouchData::AddPoint( const Integration::Point& point )
mPoints.push_back( point );
}
mPoints.push_back( point );
}
-Dev
elDev
ice::Class::Type TouchData::GetDeviceClass( std::size_t point ) const
+Device::Class::Type TouchData::GetDeviceClass( std::size_t point ) const
{
if( point < mPoints.size() )
{
return mPoints[ point ].GetDeviceClass();
}
{
if( point < mPoints.size() )
{
return mPoints[ point ].GetDeviceClass();
}
- return Dev
elDev
ice::Class::NONE;
+ return Device::Class::NONE;
}
}
-Dev
elDev
ice::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const
+Device::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const
{
if( point < mPoints.size() )
{
return mPoints[ point ].GetDeviceSubclass();
}
{
if( point < mPoints.size() )
{
return mPoints[ point ].GetDeviceSubclass();
}
- return DevelDevice::Subclass::NONE;
+ return Device::Subclass::NONE;
+}
+
+MouseButton::Type TouchData::GetMouseButton( std::size_t point ) const
+{
+ if( point < mPoints.size() )
+ {
+ return mPoints[ point ].GetMouseButton();
+ }
+ return MouseButton::INVALID;
}
} // namsespace Internal
}
} // namsespace Internal