From 6186aaa589ca62c2c9692e90a32f854a9b2facb2 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Tue, 1 Sep 2020 18:02:27 +0900 Subject: [PATCH] Revert "Removed the deprecated Dali::Internal::Adaptor::Window::ResizedSignal()." This reverts commit 57cbca074e681edd626bec225f005800b2528e46. --- dali/internal/window-system/common/window-impl.cpp | 4 ++++ dali/internal/window-system/common/window-impl.h | 6 ++++++ dali/public-api/adaptor-framework/window.cpp | 6 ++++++ dali/public-api/adaptor-framework/window.h | 15 +++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index e91421a..8b33e2d 100755 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -88,6 +88,7 @@ Window::Window() mWindowHeight( 0 ), mOrientationMode( Internal::Adaptor::Window::OrientationMode::PORTRAIT ), mNativeWindowId( -1 ), + mResizedSignal(), mDeleteRequestSignal(), mFocusChangeSignal(), mResizeSignal(), @@ -625,6 +626,7 @@ void Window::SetSize( Dali::Window::WindowSize size ) DALI_LOG_RELEASE_INFO( "Window (%p), WinId (%d), SetSize(): resize signal [%d x %d]\n", this, mNativeWindowId, newRect.width, newRect.height ); Dali::Window handle( this ); + mResizedSignal.Emit( newSize ); mResizeSignal.Emit( handle, newSize ); mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); @@ -703,6 +705,7 @@ void Window::SetPositionSize( PositionSize positionSize ) DALI_LOG_RELEASE_INFO( "Window (%p), WinId (%d), SetPositionSize():resize signal [%d x %d]\n", this, mNativeWindowId, newRect.width, newRect.height ); Dali::Window handle( this ); + mResizedSignal.Emit( newSize ); mResizeSignal.Emit( handle, newSize ); mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); } @@ -870,6 +873,7 @@ void Window::OnRotation( const RotationEvent& rotation ) DALI_LOG_RELEASE_INFO( "Window (%p), WinId (%d), OnRotation(): resize signal emit [%d x %d]\n", this, mNativeWindowId, mWindowWidth, mWindowHeight ); // Emit signal Dali::Window handle( this ); + mResizedSignal.Emit( Dali::Window::WindowSize( mWindowWidth, mWindowHeight ) ); mResizeSignal.Emit( handle, Dali::Window::WindowSize( mWindowWidth, mWindowHeight ) ); mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( mWindowWidth, mWindowHeight ) ); diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 2b9b603..5bc3bb9 100755 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -58,6 +58,7 @@ using EventHandlerPtr = IntrusivePtr< EventHandler >; class Window : public Dali::Internal::Adaptor::SceneHolder, public EventHandler::Observer, public ConnectionTracker { public: + typedef Dali::Window::ResizedSignalType ResizedSignalType; typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType; typedef Dali::Window::ResizeSignalType ResizeSignalType; typedef Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType; @@ -499,6 +500,10 @@ public: // Signals * @copydoc Dali::Window::FocusChangeSignal() */ FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; } + /** + * @copydoc Dali::Window::ResizedSignal() + */ + ResizedSignalType& ResizedSignal() { return mResizedSignal; } /** * @copydoc Dali::Window::ResizedSignal() @@ -559,6 +564,7 @@ private: int mNativeWindowId; ///< The Native Window Id // Signals + ResizedSignalType mResizedSignal; SignalType mDeleteRequestSignal; FocusChangeSignalType mFocusChangeSignal; ResizeSignalType mResizeSignal; diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index ca734c2..000f350 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -289,6 +289,12 @@ int Window::GetBrightness() const return GetImplementation(*this).GetBrightness(); } +Window::ResizedSignalType& Window::ResizedSignal() +{ + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ResizedSignal is deprecated and will be removed from next release.\n" ); + return GetImplementation(*this).ResizedSignal(); +} + Window::ResizeSignalType& Window::ResizeSignal() { return GetImplementation(*this).ResizeSignal(); diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h index 06ec8eb..ccb484e 100644 --- a/dali/public-api/adaptor-framework/window.h +++ b/dali/public-api/adaptor-framework/window.h @@ -73,6 +73,7 @@ public: using WindowSize = Uint16Pair ; ///< Window size type @SINCE_1_2.60 using WindowPosition = Uint16Pair; ///< Window position type @SINCE_1_2.60 + using ResizedSignalType = Signal< void (WindowSize) >; ///< @DEPRECATED_1_4.35 @brief Window resized signal type @SINCE_1_2.60 using FocusChangeSignalType = Signal< void (Window,bool) >; ///< Window focus signal type @SINCE_1_4.35 using ResizeSignalType = Signal< void (Window,WindowSize) >; ///< Window resized signal type @SINCE_1_4.35 using KeyEventSignalType = Signal< void (const KeyEvent&) >; ///< Key event signal type @@ -617,6 +618,20 @@ public: public: // Signals /** + * @brief This signal is emitted when the window is resized. + * + * A callback of the following type may be connected: + * @code + * void YourCallbackName( int width, int height ); + * @endcode + * The parameters are the resized width and height. + * + * @SINCE_1_2.60 + * @return The signal to connect to + */ + ResizedSignalType& ResizedSignal() DALI_DEPRECATED_API; + + /** * @brief The user should connect to this signal to get a timing when window gains focus or loses focus. * * A callback of the following type may be connected: -- 2.7.4