From e3c4d63367266abf7ed163de3e8ef374dd90dae5 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Wed, 4 Jan 2017 17:11:57 +0900 Subject: [PATCH] Added internal api for emitting delete signal When missing cb is called, emit delete signal Change-Id: Id2ae2903ac716dac1ee11b4024ff49639e61ce19 --- internal/widget_view/widget_view_impl.cpp | 18 ++++-------------- internal/widget_view/widget_view_impl.h | 3 +-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/internal/widget_view/widget_view_impl.cpp b/internal/widget_view/widget_view_impl.cpp index 9be9ba3..b7e8b74 100644 --- a/internal/widget_view/widget_view_impl.cpp +++ b/internal/widget_view/widget_view_impl.cpp @@ -135,6 +135,7 @@ static void OnSurfaceRemoved( const char *appid, const char *instance_id, const if( widgetView ) { widgetView->CloseRemoteSurface(); + widgetView->RemoveWidgetImage(); } } @@ -409,29 +410,18 @@ void WidgetView::CreateWidgetImageView() Dali::WidgetView::WidgetView handle( GetOwner() ); mWidgetAddedSignal.Emit( handle ); - DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::AddObjectView: ObjectView is added.\n" ); + DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::CreateWidgetImageView: Widget image is added.\n" ); } -void WidgetView::RemoveObjectView() +void WidgetView::RemoveWidgetImage() { - // Enable preview and text - if( mPreviewVisible ) - { - mPreviewImage.SetVisible( true ); - } - - if( mStateTextVisible ) - { - mStateText.SetVisible( true ); - } - // Emit signal Dali::WidgetView::WidgetView handle( GetOwner() ); mWidgetDeletedSignal.Emit( handle ); mWidgetImageView.Reset(); - DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::RemoveObjectView: ObjectView is removed.\n" ); + DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::RemoveWidgetImage: Widget image is removed.\n" ); } void WidgetView::SendWidgetEvent( int event ) diff --git a/internal/widget_view/widget_view_impl.h b/internal/widget_view/widget_view_impl.h index 9c5cef6..eae1155 100644 --- a/internal/widget_view/widget_view_impl.h +++ b/internal/widget_view/widget_view_impl.h @@ -124,8 +124,7 @@ public: // Internal API void SetPermanentDelete( bool permanentDelete ); -// ToDo: This funstion will be used for widgetDeletedSignal - void RemoveObjectView(); + void RemoveWidgetImage(); bool IsPermanentDelete(); -- 2.34.1