From 2db73b90b0c1e18bac6aefcc99f2f219a412df8f Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 12 Nov 2019 15:15:29 +0900 Subject: [PATCH] Revert "[Tizen] Add visibility changed signal to Window" This reverts commit 4a9e4c30b48b78a9767fe0810fad00ba9169e36d. Change-Id: If55daf0e75531ce40b6908a82d9d3e3f739f302f --- dali/devel-api/adaptor-framework/window-devel.cpp | 5 ----- dali/devel-api/adaptor-framework/window-devel.h | 14 -------------- dali/internal/window-system/common/window-impl.cpp | 13 ------------- dali/internal/window-system/common/window-impl.h | 8 -------- 4 files changed, 40 deletions(-) diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index aefb546..c16a520 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -65,11 +65,6 @@ WheelEventSignalType& WheelEventSignal( Window window ) return GetImplementation( window ).WheelEventSignal(); } -VisibilityChangedSignalType& VisibilityChangedSignal( Window window ) -{ - return GetImplementation( window ).VisibilityChangedSignal(); -} - TransitionEffectEventSignalType& TransitionEffectEventSignal( Window window ) { return GetImplementation( window ).TransitionEffectEventSignal(); diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 9c02a70..da532d3 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -58,8 +58,6 @@ typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch si typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type -typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType; ///< Visibility changed signal type - typedef Signal< void (Window, EffectState, EffectType) > TransitionEffectEventSignalType; ///< Effect signal type and state /** @@ -137,18 +135,6 @@ DALI_ADAPTOR_API TouchSignalType& TouchSignal( Window window ); DALI_ADAPTOR_API WheelEventSignalType& WheelEventSignal( Window window ); /** - * @brief This signal is emitted when the window is shown or hidden. - * - * A callback of the following type may be connected: - * @code - * void YourCallbackName( Window window, bool visible ); - * @endcode - * @param[in] window The window instance - * @return The signal to connect to - */ -DALI_ADAPTOR_API VisibilityChangedSignalType& VisibilityChangedSignal( Window window ); - -/** * @brief This signal is emitted for transition effect. * * The transition animation is appeared when the window is shown/hidden. diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index fbf04ca..0db7230 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -87,7 +87,6 @@ Window::Window() mDeleteRequestSignal(), mFocusChangeSignal(), mResizeSignal(), - mVisibilityChangedSignal(), mTransitionEffectEventSignal() { } @@ -294,9 +293,6 @@ void Window::Show() { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowShown(); - - Dali::Window handle( this ); - mVisibilityChangedSignal.Emit( handle, true ); } DALI_LOG_RELEASE_INFO( "Window (%p) Show(): iconified = %d\n", this, mIconified ); @@ -312,9 +308,6 @@ void Window::Hide() { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowHidden(); - - Dali::Window handle( this ); - mVisibilityChangedSignal.Emit( handle, false ); } DALI_LOG_RELEASE_INFO( "Window (%p) Hide(): iconified = %d\n", this, mIconified ); @@ -584,9 +577,6 @@ void Window::OnIconifyChanged( bool iconified ) { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowHidden(); - - Dali::Window handle( this ); - mVisibilityChangedSignal.Emit( handle, false ); } DALI_LOG_RELEASE_INFO( "Window (%p) Iconified: visible = %d\n", this, mVisible ); @@ -599,9 +589,6 @@ void Window::OnIconifyChanged( bool iconified ) { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowShown(); - - Dali::Window handle( this ); - mVisibilityChangedSignal.Emit( handle, true ); } DALI_LOG_RELEASE_INFO( "Window (%p) Deiconified: visible = %d\n", this, mVisible ); diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 69b2b27..cca3643 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -67,7 +67,6 @@ public: typedef Dali::Window::ResizedSignalType ResizedSignalType; typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType; typedef Dali::Window::ResizeSignalType ResizeSignalType; - typedef Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType; typedef Dali::DevelWindow::TransitionEffectEventSignalType TransitionEffectEventSignalType; typedef Signal< void () > SignalType; @@ -476,7 +475,6 @@ public: // Signals * @copydoc Dali::Window::ResizedSignal() */ ResizedSignalType& ResizedSignal() { return mResizedSignal; } - /** * @copydoc Dali::Window::ResizedSignal() */ @@ -488,11 +486,6 @@ public: // Signals SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; } /** - * @copydoc Dali::DevelWindow::VisibilityChangedSignal() - */ - VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; } - - /** * @copydoc Dali::Window::SignalEventProcessingFinished() */ Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } @@ -533,7 +526,6 @@ private: SignalType mDeleteRequestSignal; FocusChangeSignalType mFocusChangeSignal; ResizeSignalType mResizeSignal; - VisibilityChangedSignalType mVisibilityChangedSignal; TransitionEffectEventSignalType mTransitionEffectEventSignal; }; -- 2.7.4