From 1017cfe5bd43436d0bdad29323aef63f0e462521 Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Wed, 9 Aug 2017 14:27:40 +0900 Subject: [PATCH] Revert "Added handler for ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE" This handler has the same issue with pause handler Each application should handle pause or visibility event This reverts commit 323ab758ec1c5d733c37a2a36762b15d1808b6dc. Conflicts: adaptors/ecore/wayland/window-impl-ecore-wl.cpp Change-Id: I18e9efada2a09148b24bb4ebfc60b7faa2ee2590 --- adaptors/ecore/wayland/window-impl-ecore-wl.cpp | 30 ------------------------- 1 file changed, 30 deletions(-) diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp index 6f9b2a7..6f785d0 100644 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -95,7 +95,6 @@ struct Window::EventHandler if( mWindow->mEcoreEventHander ) { mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_ICONIFY_STATE_CHANGE, EcoreEventWindowIconifyStateChanged, this ) ); - mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE, EcoreEventWindowVisibilityChanged, this ) ); mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_IN, EcoreEventWindowFocusIn, this ) ); mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_FOCUS_OUT, EcoreEventWindowFocusOut, this ) ); mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL_EVENT_OUTPUT_TRANSFORM, EcoreEventOutputTransform, this) ); @@ -171,35 +170,6 @@ struct Window::EventHandler return handled; } - /// Called when the window visibility is changed. - static Eina_Bool EcoreEventWindowVisibilityChanged( void* data, int type, void* event ) - { - Ecore_Wl_Event_Window_Visibility_Change* visibilityChangedEvent( static_cast< Ecore_Wl_Event_Window_Visibility_Change* >( event ) ); - EventHandler* handler( static_cast< EventHandler* >( data ) ); - Eina_Bool handled( ECORE_CALLBACK_PASS_ON ); - - if ( handler && handler->mWindow ) - { - WindowVisibilityObserver* observer( handler->mWindow->mAdaptor ); - if ( observer && ( visibilityChangedEvent->win == static_cast< unsigned int >( ecore_wl_window_id_get( handler->mEcoreWindow ) ) ) ) - { - if( visibilityChangedEvent->fully_obscured == 1 ) - { - observer->OnWindowHidden(); - DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) full obscured\n", handler->mEcoreWindow ); - } - else - { - observer->OnWindowShown(); - DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Shown\n", handler->mEcoreWindow ); - } - handled = ECORE_CALLBACK_DONE; - } - } - - return handled; - } - /// Called when the window gains focus static Eina_Bool EcoreEventWindowFocusIn( void* data, int type, void* event ) { -- 2.7.4