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
/
public-api
/
events
/
touch-data.cpp
diff --git
a/dali/public-api/events/touch-data.cpp
b/dali/public-api/events/touch-data.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
1dcdbd6
..
54d9a5e
--- a/
dali/public-api/events/touch-data.cpp
+++ b/
dali/public-api/events/touch-data.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
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.
@@
-20,7
+20,6
@@
// INTERNAL INCLUDES
#include <dali/public-api/actors/actor.h>
// INTERNAL INCLUDES
#include <dali/public-api/actors/actor.h>
-#include <dali/devel-api/events/touch-event-devel.h>
#include <dali/internal/event/events/touch-data-impl.h>
#include <cstdio>
#include <dali/internal/event/events/touch-data-impl.h>
#include <cstdio>
@@
-103,14
+102,19
@@
Degree TouchData::GetAngle( std::size_t point ) const
return GetImplementation( *this ).GetAngle( point );
}
return GetImplementation( *this ).GetAngle( point );
}
-Dev
elDevice::Class::Type DevelTouchData::GetDeviceClass( const TouchData& touch, std::size_t point )
+Dev
ice::Class::Type TouchData::GetDeviceClass( std::size_t point ) const
{
{
- return GetImplementation(
touch
).GetDeviceClass( point );
+ return GetImplementation(
*this
).GetDeviceClass( point );
}
}
-Dev
elDevice::Subclass::Type DevelTouchData::GetDeviceSubclass( const TouchData& touch, std::size_t point )
+Dev
ice::Subclass::Type TouchData::GetDeviceSubclass( std::size_t point ) const
{
{
- return GetImplementation( touch ).GetDeviceSubclass( point );
+ return GetImplementation( *this ).GetDeviceSubclass( point );
+}
+
+MouseButton::Type TouchData::GetMouseButton( std::size_t point ) const
+{
+ return GetImplementation( *this ).GetMouseButton( point );
}
TouchData::TouchData( Internal::TouchData* internal )
}
TouchData::TouchData( Internal::TouchData* internal )