From: taeyoon Date: Tue, 13 Dec 2016 06:47:47 +0000 (-0800) Subject: Merge "Remove key event callback" into tizen_3.0 X-Git-Tag: accepted/tizen/4.0/unified/20170920.081503~1^2~33 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git;a=commitdiff_plain;h=41c42ee9ac0d2fae2dd1f05760ae6c7d8f412f0e;hp=-c Merge "Remove key event callback" into tizen_3.0 --- 41c42ee9ac0d2fae2dd1f05760ae6c7d8f412f0e diff --combined internal/widget_view/widget_view_impl.cpp index 8817de6,068ee35..d08218f --- a/internal/widget_view/widget_view_impl.cpp +++ b/internal/widget_view/widget_view_impl.cpp @@@ -89,39 -89,6 +89,6 @@@ DALI_ACTION_REGISTRATION( Dali::WidgetV DALI_TYPE_REGISTRATION_END() - static Eina_Bool OnKeyDown( void* data, int type, void* eventInfo ) - { - Ecore_Event_Key *event = static_cast< Ecore_Event_Key* >( eventInfo ); - tizen_remote_surface* surface = static_cast< tizen_remote_surface* >( data ); - - tizen_remote_surface_transfer_key_event( surface, - TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_DOWN, - event->keycode, - ecore_device_class_get(event->dev), - ecore_device_subclass_get(event->dev), - ecore_device_identifier_get(event->dev), - event->timestamp - ); - - return EINA_TRUE; - } - - static Eina_Bool OnKeyUp(void* data, int type, void* eventInfo) - { - Ecore_Event_Key *event = static_cast< Ecore_Event_Key* >( eventInfo ); - tizen_remote_surface* surface = static_cast< tizen_remote_surface* >( data ); - - tizen_remote_surface_transfer_key_event( surface, - TIZEN_REMOTE_SURFACE_EVENT_TYPE_KEY_UP, - event->keycode, - ecore_device_class_get(event->dev), - ecore_device_subclass_get(event->dev), - ecore_device_identifier_get(event->dev), - event->timestamp - ); - return EINA_TRUE; - } - static void OnSurfaceUpdate( struct tizen_remote_surface* surface, wl_buffer* buffer, uint32_t time, void* data ) { Dali::WidgetView::Internal::WidgetView* widgetView = static_cast< Dali::WidgetView::Internal::WidgetView* >( data ); @@@ -134,8 -101,6 +101,6 @@@ widgetView->CreateWidgetImageView(); widgetView->ConnectSignal( surface ); - ecore_event_handler_add( ECORE_EVENT_KEY_DOWN, OnKeyDown, surface ); - ecore_event_handler_add( ECORE_EVENT_KEY_UP, OnKeyUp, surface ); } //get tbm surface from buffer @@@ -741,9 -706,7 +706,9 @@@ void WidgetView::OnInitialize( mPreviewImage.SetSize( mWidth, mHeight ); } - Self().SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS ); + Self().SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); + Self().SetSize( mWidth, mHeight ); + Self().Add( mPreviewImage ); // State text