X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fadaptor-framework%2Fscene-holder.cpp;h=7cb0772ffb579432dd99b25b09d411afcbd7f0b9;hb=3d79c3f3a4d14a257b09ce12e823146177744ae0;hp=d7b1514c4fac83f20f8bdcee275e14ecf13bfa19;hpb=87425c2c91241f25877bc368589b66250cb24ad9;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/integration-api/adaptor-framework/scene-holder.cpp b/dali/integration-api/adaptor-framework/scene-holder.cpp index d7b1514..7cb0772 100644 --- a/dali/integration-api/adaptor-framework/scene-holder.cpp +++ b/dali/integration-api/adaptor-framework/scene-holder.cpp @@ -102,8 +102,8 @@ void SceneHolder::FeedWheelEvent( Dali::WheelEvent& wheelEvent ) void SceneHolder::FeedKeyEvent( Dali::KeyEvent& keyEvent ) { - Integration::KeyEvent convertedEvent( keyEvent ); - GetImplementation(*this).FeedKeyEvent( convertedEvent ); + Integration::KeyEvent event( keyEvent.GetKeyName(), keyEvent.GetLogicalKey(), keyEvent.GetKeyString(), keyEvent.GetKeyCode(), keyEvent.GetKeyModifier(), keyEvent.GetTime(), static_cast< Integration::KeyEvent::State >( keyEvent.GetState() ), keyEvent.GetCompose(), keyEvent.GetDeviceName(), keyEvent.GetDeviceClass(), keyEvent.GetDeviceSubclass() ); + GetImplementation(*this).FeedKeyEvent( event ); } SceneHolder SceneHolder::Get( Actor actor ) @@ -121,9 +121,9 @@ SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() return GetImplementation(*this).KeyEventGeneratedSignal(); } -SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +SceneHolder::TouchEventSignalType& SceneHolder::TouchedSignal() { - return GetImplementation(*this).TouchSignal(); + return GetImplementation(*this).TouchedSignal(); } SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()