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
Added device information in TouchData/KeyEvent
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
events
/
key-event-impl.cpp
diff --git
a/dali/internal/event/events/key-event-impl.cpp
b/dali/internal/event/events/key-event-impl.cpp
index
e04d8c8
..
f6a0a32
100644
(file)
--- a/
dali/internal/event/events/key-event-impl.cpp
+++ b/
dali/internal/event/events/key-event-impl.cpp
@@
-39,7
+39,8
@@
namespace Internal
KeyEventImpl::KeyEventImpl( KeyEvent* keyEvent )
: mDeviceName( "" ),
KeyEventImpl::KeyEventImpl( KeyEvent* keyEvent )
: mDeviceName( "" ),
- mDeviceClass( DevelKeyEvent::DeviceClass::NONE )
+ mDeviceClass( DevelDevice::Class::NONE ),
+ mDeviceSubclass( DevelDevice::Subclass::NONE )
{
keyEventImplMap[keyEvent] = this;
}
{
keyEventImplMap[keyEvent] = this;
}
@@
-62,6
+63,7
@@
KeyEventImpl& KeyEventImpl::operator=( const KeyEventImpl& rhs )
{
mDeviceName = rhs.mDeviceName;
mDeviceClass = rhs.mDeviceClass;
{
mDeviceName = rhs.mDeviceName;
mDeviceClass = rhs.mDeviceClass;
+ mDeviceSubclass = rhs.mDeviceSubclass;
}
return *this;
}
return *this;
@@
-77,16
+79,26
@@
void KeyEventImpl::SetDeviceName( const std::string& deviceName )
mDeviceName = deviceName;
}
mDeviceName = deviceName;
}
-Devel
KeyEvent::Device
Class::Type KeyEventImpl::GetDeviceClass() const
+Devel
Device::
Class::Type KeyEventImpl::GetDeviceClass() const
{
return mDeviceClass;
}
{
return mDeviceClass;
}
-void KeyEventImpl::SetDeviceClass(
const DevelKeyEvent::DeviceClass::Type&
deviceClass )
+void KeyEventImpl::SetDeviceClass(
DevelDevice::Class::Type
deviceClass )
{
mDeviceClass = deviceClass;
}
{
mDeviceClass = deviceClass;
}
+DevelDevice::Subclass::Type KeyEventImpl::GetDeviceSubclass() const
+{
+ return mDeviceSubclass;
+}
+
+void KeyEventImpl::SetDeviceSubclass( DevelDevice::Subclass::Type deviceSubclass )
+{
+ mDeviceSubclass = deviceSubclass;
+}
+
} // namsespace Internal
Internal::KeyEventImpl* GetImplementation( KeyEvent* keyEvent )
} // namsespace Internal
Internal::KeyEventImpl* GetImplementation( KeyEvent* keyEvent )