From: Joogab Yun Date: Tue, 10 Sep 2019 09:15:50 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: accepted/tizen/unified/20190911.111623~6 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=c7fac03967c7400d7a03457b9bd0aab9da4fa949;hp=840e9dfe30ec8c4305bed6ea68626c88842152c7 Merge branch 'devel/master' into tizen --- diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp index f3029fa..338b71f 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp @@ -28,7 +28,8 @@ TestApplication::TestApplication( uint32_t surfaceWidth, uint32_t verticalDpi, ResourcePolicy::DataRetention policy, bool initialize ) -: mCore( NULL ), +: mRenderSurface( NULL ), + mCore( NULL ), mSurfaceWidth( surfaceWidth ), mSurfaceHeight( surfaceHeight ), mFrame( 0u ), diff --git a/dali/devel-api/adaptor-framework/file-stream.h b/dali/devel-api/adaptor-framework/file-stream.h index 8fa9999..de69f06 100644 --- a/dali/devel-api/adaptor-framework/file-stream.h +++ b/dali/devel-api/adaptor-framework/file-stream.h @@ -107,6 +107,7 @@ public: /** * @brief Returns the file stream * @return FILE. + * @note This class is responsible for closing the file so the caller SHOULD NOT call fclose() on the returned pointer. */ FILE* GetFile(); diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index 04e2902..9d93348 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -55,11 +55,6 @@ KeyEventSignalType& KeyEventSignal( Window window ) return GetImplementation( window ).KeyEventSignal(); } -KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ) -{ - return GetImplementation( window ).KeyEventGeneratedSignal(); -} - TouchSignalType& TouchSignal( Window window ) { return GetImplementation( window ).TouchSignal(); @@ -85,6 +80,10 @@ Window GetParent( Window window ) return GetImplementation( window ).GetParent(); } +Window DownCast( BaseHandle handle ) +{ + return Window( dynamic_cast( handle.GetObjectPtr()) ); +} } // namespace DevelWindow } // namespace Dali diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index bdcd9a5..ca90c51 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -35,8 +35,6 @@ typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Pr typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type -typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type - typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -86,18 +84,6 @@ DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSigna DALI_ADAPTOR_API KeyEventSignalType& KeyEventSignal( Window window ); /** - * @brief This signal is emitted when key event is received. - * - * A callback of the following type may be connected: - * @code - * bool YourCallbackName(const KeyEvent& event); - * @endcode - * @param[in] window The window instance - * @return The signal to connect to - */ -DALI_ADAPTOR_API KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ); - -/** * @brief This signal is emitted when the screen is touched and when the touch ends * (i.e. the down & up touch events only). * @@ -156,6 +142,14 @@ DALI_ADAPTOR_API void Unparent( Window window ); */ DALI_ADAPTOR_API Window GetParent( Window window ); +/** + * @brief Downcast sceneHolder to window + * + * @param[in] handle The handle need to downcast + * @return The window cast from SceneHolder + */ +DALI_ADAPTOR_API Window DownCast( BaseHandle handle ); + } // namespace DevelWindow } // namespace Dali diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h index cb19fa0..eb0f6f0 100755 --- a/dali/integration-api/adaptor.h +++ b/dali/integration-api/adaptor.h @@ -52,6 +52,8 @@ namespace Integration class SceneHolder; } +using SceneHolderList = std::vector; + namespace Internal { @@ -125,7 +127,7 @@ class DALI_ADAPTOR_API Adaptor public: typedef Signal< void (Adaptor&) > AdaptorSignalType; ///< Generic Type for adaptor signals - typedef Signal< void (Window&) > WindowCreatedSignalType; ///< Window created signal type + typedef Signal< void (Dali::Integration::SceneHolder&) > WindowCreatedSignalType; ///< SceneHolder created signal type using SurfaceSize = Uint16Pair; ///< Surface size type @@ -469,6 +471,12 @@ public: Dali::WindowContainer GetWindows() const; /** + * @brief Get the list of scene holders. + * @return The list of scene holers + */ + SceneHolderList GetSceneHolders() const; + + /** * @brief Called when the window becomes fully or partially visible. */ void OnWindowShown(); @@ -496,7 +504,7 @@ public: // Signals AdaptorSignalType& LanguageChangedSignal(); /** - * @brief This signal is emitted when a new window is created + * @brief This signal is emitted when a new window (scene holder) is created * * @return The signal to connect to */ diff --git a/dali/integration-api/scene-holder-impl.h b/dali/integration-api/scene-holder-impl.h index 78682ea..29ebf02 100644 --- a/dali/integration-api/scene-holder-impl.h +++ b/dali/integration-api/scene-holder-impl.h @@ -172,6 +172,26 @@ public: */ static Dali::Integration::SceneHolder Get( Dali::Actor actor ); + /** + * @copydoc Dali::Integration::SceneHolder::KeyEventSignal() + */ + Dali::Integration::SceneHolder::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); } + + /** + * @copydoc Dali::Integration::SceneHolder::KeyEventGeneratedSignal() + */ + Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); } + + /** + * @copydoc Dali::Integration::SceneHolder::TouchSignal() + */ + Dali::Integration::SceneHolder::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); } + + /** + * @copydoc Dali::Integration::SceneHolder::WheelEventSignal() + */ + Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal() { return mScene.WheelEventSignal(); } + public: // The following methods can be overridden if required /** diff --git a/dali/integration-api/scene-holder.cpp b/dali/integration-api/scene-holder.cpp index 8f456d9..7a232b9 100644 --- a/dali/integration-api/scene-holder.cpp +++ b/dali/integration-api/scene-holder.cpp @@ -111,6 +111,26 @@ SceneHolder SceneHolder::Get( Actor actor ) return Internal::Adaptor::SceneHolder::Get( actor ); } +SceneHolder::KeyEventSignalType& SceneHolder::KeyEventSignal() +{ + return GetImplementation(*this).KeyEventSignal(); +} + +SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal() +{ + return GetImplementation(*this).KeyEventGeneratedSignal(); +} + +SceneHolder::TouchSignalType& SceneHolder::TouchSignal() +{ + return GetImplementation(*this).TouchSignal(); +} + +SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal() +{ + return GetImplementation(*this).WheelEventSignal(); +} + }// Integration } // Dali diff --git a/dali/integration-api/scene-holder.h b/dali/integration-api/scene-holder.h index 4881d22..905ed6b 100644 --- a/dali/integration-api/scene-holder.h +++ b/dali/integration-api/scene-holder.h @@ -22,6 +22,7 @@ #include #include #include +#include namespace Dali { @@ -29,6 +30,7 @@ namespace Dali class Actor; class Layer; class Any; +class TouchData; struct TouchPoint; struct WheelEvent; struct KeyEvent; @@ -55,6 +57,14 @@ class DALI_ADAPTOR_API SceneHolder : public BaseHandle { public: + typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type + + typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type + + typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type + + typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type + /** * @brief Create an uninitialized SceneHolder handle. */ @@ -158,6 +168,55 @@ public: */ static SceneHolder Get( Actor actor ); + /** + * @brief This signal is emitted when key event is received. + * + * A callback of the following type may be connected: + * @code + * void YourCallbackName(const KeyEvent& event); + * @endcode + * @return The signal to connect to + */ + KeyEventSignalType& KeyEventSignal(); + + /** + * @brief This signal is emitted when key event is received. + * + * A callback of the following type may be connected: + * @code + * bool YourCallbackName(const KeyEvent& event); + * @endcode + * @return The signal to connect to + */ + KeyEventGeneratedSignalType& KeyEventGeneratedSignal(); + + /** + * @brief This signal is emitted when the screen is touched and when the touch ends + * (i.e. the down & up touch events only). + * + * If there are multiple touch points, then this will be emitted when the first touch occurs and + * then when the last finger is lifted. + * An interrupted event will also be emitted (if it occurs). + * A callback of the following type may be connected: + * @code + * void YourCallbackName( TouchData event ); + * @endcode + * @return The touch signal to connect to + * @note Motion events are not emitted. + */ + TouchSignalType& TouchSignal(); + + /** + * @brief This signal is emitted when wheel event is received. + * + * A callback of the following type may be connected: + * @code + * void YourCallbackName(const WheelEvent& event); + * @endcode + * @return The signal to connect to + */ + WheelEventSignalType& WheelEventSignal(); + public: // Not intended for application developers /** diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index 868345d..3416ed8 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -188,11 +188,9 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: defaultWindow->SetAdaptor( Get() ); - Dali::Window window( dynamic_cast( defaultWindow ) ); - if ( window ) - { - mWindowCreatedSignal.Emit( window ); - } + Dali::Integration::SceneHolder defaultSceneHolder( defaultWindow ); + + mWindowCreatedSignal.Emit( defaultSceneHolder ); const unsigned int timeInterval = mEnvironmentOptions->GetObjectProfilerInterval(); if( 0u < timeInterval ) @@ -291,7 +289,7 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: } std::string systemCachePath = GetSystemCachePath(); - if ( systemCachePath.c_str() != NULL ) + if ( ! systemCachePath.empty() ) { Dali::FileStream fileStream( systemCachePath + "gpu-environment.conf", Dali::FileStream::READ | Dali::FileStream::TEXT ); std::fstream& stream = dynamic_cast( fileStream.GetStream() ); @@ -645,11 +643,7 @@ bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow, const std:: // Add the new Window to the container - the order is not important mWindows.push_back( &windowImpl ); - Dali::Window window( dynamic_cast( &windowImpl ) ); - if ( window ) - { - mWindowCreatedSignal.Emit( window ); - } + mWindowCreatedSignal.Emit( childWindow ); return true; } @@ -1116,6 +1110,18 @@ Dali::WindowContainer Adaptor::GetWindows() const return windows; } +Dali::SceneHolderList Adaptor::GetSceneHolders() const +{ + Dali::SceneHolderList sceneHolderList; + + for( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter ) + { + sceneHolderList.push_back( Dali::Integration::SceneHolder( *iter ) ); + } + + return sceneHolderList; +} + Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions) : mResizedSignal(), mLanguageChangedSignal(), diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index 99e4a0c..74f7ab3 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -313,6 +313,11 @@ public: // AdaptorInternalServices implementation */ Dali::WindowContainer GetWindows() const; + /** + * @copydoc Dali::Adaptor::GetSceneHolders() + */ + Dali::SceneHolderList GetSceneHolders() const; + public: /** @@ -650,7 +655,7 @@ private: // Data AdaptorSignalType mResizedSignal; ///< Resized signal. AdaptorSignalType mLanguageChangedSignal; ///< Language changed signal. - WindowCreatedSignalType mWindowCreatedSignal; ///< Window created signal. + WindowCreatedSignalType mWindowCreatedSignal; ///< Window created signal. Dali::Adaptor& mAdaptor; ///< Reference to public adaptor instance. State mState; ///< Current state of the adaptor diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index 73fe2b3..195f936 100755 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -261,6 +261,11 @@ Dali::WindowContainer Adaptor::GetWindows() const return mImpl->GetWindows(); } +SceneHolderList Adaptor::GetSceneHolders() const +{ + return mImpl->GetSceneHolders(); +} + void Adaptor::OnWindowShown() { mImpl->OnWindowShown(); diff --git a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp index 29abb88..dea0df7 100644 --- a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp +++ b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp @@ -167,7 +167,7 @@ void Framework::Run() { mRunning = true; - elm_init(*mArgc, *mArgv); + elm_init( mArgc ? *mArgc : 0, mArgv ? *mArgv : nullptr ); Impl::AppCreate(this); diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp index 73b1a43..b5bf294 100755 --- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp +++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp @@ -604,33 +604,36 @@ bool InputMethodContextEcoreWl::RetrieveSurrounding( void* data, ImfContext* imf if( callbackData.update ) { + if( cursorPosition ) + { + mIMFCursorPosition = static_cast( callbackData.cursorPosition ); + *cursorPosition = mIMFCursorPosition; + } + if( text ) { const char* plainText = callbackData.currentText.c_str(); + if( plainText ) { + // The memory allocated by strdup() can be freed by ecore_imf_context_surrounding_get() internally. + *text = strdup( plainText ); + // If the current input panel is password mode, dali should replace the plain text with '*' (Asterisk) character. if( ecore_imf_context_input_hint_get( mIMFContext ) & ECORE_IMF_INPUT_HINT_SENSITIVE_DATA ) { - char* iter = NULL; - for( iter = const_cast( plainText ); iter && *iter; ++iter ) + for( char* iter = *text; *iter; ++iter ) { *iter = '*'; } } - } - // The memory allocated by strdup() can be freed by ecore_imf_context_surrounding_get() internally. - *text = strdup( plainText ); - } - if( cursorPosition ) - { - mIMFCursorPosition = static_cast( callbackData.cursorPosition ); - *cursorPosition = mIMFCursorPosition; + return EINA_TRUE; + } } } - return EINA_TRUE; + return EINA_FALSE; } /** diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index 4411ffa..7759dad 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -84,7 +84,9 @@ Window::Window() mWindowHeight( 0 ), mFocusChangedSignal(), mResizedSignal(), - mDeleteRequestSignal() + mDeleteRequestSignal(), + mFocusChangeSignal(), + mResizeSignal() { } @@ -456,7 +458,9 @@ void Window::SetSize( Dali::Window::WindowSize size ) mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize ); + Dali::Window handle( this ); mResizedSignal.Emit( newSize ); + mResizeSignal.Emit( handle, newSize ); mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); } @@ -512,8 +516,9 @@ void Window::SetPositionSize( PositionSize positionSize ) mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize ); + Dali::Window handle( this ); mResizedSignal.Emit( newSize ); - + mResizeSignal.Emit( handle, newSize ); mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize ); } } @@ -578,7 +583,9 @@ void Window::OnIconifyChanged( bool iconified ) void Window::OnFocusChanged( bool focusIn ) { + Dali::Window handle( this ); mFocusChangedSignal.Emit( focusIn ); + mFocusChangeSignal.Emit( handle, focusIn ); } void Window::OnOutputTransformed() @@ -625,7 +632,9 @@ void Window::OnRotation( const RotationEvent& rotation ) mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( mRotationAngle, mWindowHeight ) ); // Emit signal + Dali::Window handle( this ); mResizedSignal.Emit( Dali::Window::WindowSize( mRotationAngle, mWindowHeight ) ); + mResizeSignal.Emit( handle, Dali::Window::WindowSize( mRotationAngle, mWindowHeight ) ); mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( mRotationAngle, mWindowHeight ) ); } diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 5e8ea5b..bebb11b 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -65,6 +65,8 @@ public: typedef Dali::Window::IndicatorSignalType IndicatorSignalType; typedef Dali::Window::FocusSignalType FocusSignalType; typedef Dali::Window::ResizedSignalType ResizedSignalType; + typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType; + typedef Dali::Window::ResizeSignalType ResizeSignalType; typedef Signal< void () > SignalType; /** @@ -460,9 +462,17 @@ public: // Signals FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; } /** + * @copydoc Dali::Window::WindowFocusChangedSignal() + */ + FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; } + /** * @copydoc Dali::Window::ResizedSignal() */ ResizedSignalType& ResizedSignal() { return mResizedSignal; } + /** + * @copydoc Dali::Window::ResizedSignal() + */ + ResizeSignalType& ResizeSignal() { return mResizeSignal; } /** * This signal is emitted when the window is requesting to be deleted @@ -474,26 +484,6 @@ public: // Signals */ Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } - /** - * @copydoc Dali::Window::KeyEventSignal() - */ - Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); } - - /** - * @copydoc Dali::Window::KeyEventGeneratedSignal() - */ - Dali::DevelWindow::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); } - - /** - * @copydoc Dali::Window::TouchSignal() - */ - Dali::DevelWindow::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); } - - /** - * @copydoc Dali::Window::WheelEventSignal() - */ - Dali::DevelWindow::WheelEventSignalType& WheelEventSignal() { return mScene.WheelEventSignal(); } - private: WindowRenderSurface* mWindowSurface; ///< The window rendering surface @@ -523,8 +513,8 @@ private: FocusSignalType mFocusChangedSignal; ResizedSignalType mResizedSignal; SignalType mDeleteRequestSignal; - - + FocusChangeSignalType mFocusChangeSignal; + ResizeSignalType mResizeSignal; }; } // namespace Adaptor diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index 07ff286..14e8c04 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -189,9 +189,15 @@ Any Window::GetNativeHandle() const Window::FocusSignalType& Window::FocusChangedSignal() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: FocusChangedSignal is deprecated and will be removed from next release.\n" ); return GetImplementation(*this).FocusChangedSignal(); } +Window::FocusChangeSignalType& Window::FocusChangeSignal() +{ + return GetImplementation(*this).FocusChangeSignal(); +} + void Window::SetAcceptFocus( bool accept ) { GetImplementation(*this).SetAcceptFocus( accept ); @@ -309,9 +315,15 @@ int Window::GetBrightness() const 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(); +} + void Window::SetSize( Window::WindowSize size ) { GetImplementation(*this).SetSize( size ); diff --git a/dali/public-api/adaptor-framework/window.h b/dali/public-api/adaptor-framework/window.h index 0d559c1..fe28f45 100755 --- a/dali/public-api/adaptor-framework/window.h +++ b/dali/public-api/adaptor-framework/window.h @@ -68,9 +68,10 @@ public: typedef Uint16Pair WindowPosition; ///< Window position type @SINCE_1_2.60 typedef Signal< void (bool) > IndicatorSignalType; ///< @DEPRECATED_1_4.9 @brief Indicator state signal type @SINCE_1_0.0 - typedef Signal< void (bool) > FocusSignalType; ///< Window focus signal type @SINCE_1_2.60 - typedef Signal< void (WindowSize) > ResizedSignalType; ///< Window resized signal type @SINCE_1_2.60 - + typedef Signal< void (bool) > FocusSignalType; ///< @DEPRECATED_1_4.35 @brief Window focus signal type @SINCE_1_2.60 + typedef Signal< void (WindowSize) > ResizedSignalType; ///< @DEPRECATED_1_4.35 @brief Window resized signal type @SINCE_1_2.60 + typedef Signal< void (Window,bool) > FocusChangeSignalType; ///< Window focus signal type @SINCE_1_4.35 + typedef Signal< void (Window,WindowSize) > ResizeSignalType; ///< Window resized signal type @SINCE_1_4.35 public: // Enumerations @@ -637,6 +638,7 @@ public: // Signals IndicatorSignalType& IndicatorVisibilityChangedSignal() DALI_DEPRECATED_API; /** + * @DEPRECATED_1_4.35 * @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: @@ -648,7 +650,7 @@ public: // Signals * @SINCE_1_2.60 * @return The signal to connect to */ - FocusSignalType& FocusChangedSignal(); + FocusSignalType& FocusChangedSignal() DALI_DEPRECATED_API; /** * @brief This signal is emitted when the window is resized. @@ -662,7 +664,37 @@ public: // Signals * @SINCE_1_2.60 * @return The signal to connect to */ - ResizedSignalType& ResizedSignal(); + 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: + * @code + * void YourCallbackName( Window window, bool focusIn ); + * @endcode + * The parameter is true if window gains focus, otherwise false. + * and window means this signal was called from what window + * + * @SINCE_1_4.35 + * @return The signal to connect to + */ + FocusChangeSignalType& FocusChangeSignal(); + + /** + * @brief This signal is emitted when the window is resized. + * + * A callback of the following type may be connected: + * @code + * void YourCallbackName( Window window, int width, int height ); + * @endcode + * The parameters are the resized width and height. + * and window means this signal was called from what window + * + * @SINCE_1_4.35 + * @return The signal to connect to + */ + ResizeSignalType& ResizeSignal(); public: // Not intended for application developers /// @cond internal diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp index ea31d12..f18dace 100644 --- a/dali/public-api/dali-adaptor-version.cpp +++ b/dali/public-api/dali-adaptor-version.cpp @@ -28,7 +28,7 @@ namespace Dali const unsigned int ADAPTOR_MAJOR_VERSION = 1; const unsigned int ADAPTOR_MINOR_VERSION = 4; -const unsigned int ADAPTOR_MICRO_VERSION = 35; +const unsigned int ADAPTOR_MICRO_VERSION = 36; const char * const ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 8af12fb..bc985e8 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -17,7 +17,7 @@ Name: dali-adaptor Summary: The DALi Tizen Adaptor -Version: 1.4.35 +Version: 1.4.36 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT