X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fdevel-api%2Fadaptor-framework%2Fwindow-devel.h;h=ea3577a098e038bd7a73f4f863896b2e59652653;hb=9d6174cffaea69180402db990f4e27edb067481b;hp=42de53c8dd70d04cbea1be4e47e195fc61415b91;hpb=876755e06bd010fbc1a1193121f0be0287e65254;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 42de53c..ea3577a 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -22,8 +22,9 @@ #include // INTERNAL INCLUDES -#include #include +#include +#include namespace Dali { @@ -34,39 +35,20 @@ class RenderTaskList; namespace DevelWindow { -/** - * @brief Enumeration for transition effect's state. - */ -enum class EffectState -{ - NONE = 0, ///< None state - START, ///< Transition effect is started. - END ///< Transition effect is ended. -}; -/** - * @brief Enumeration for transition effect's type. - */ -enum class EffectType -{ - NONE = 0, ///< None type - SHOW, ///< Window show effect. - HIDE, ///< Window hide effect. -}; +typedef Signal EventProcessingFinishedSignalType; ///< Event Processing finished signal type -typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type +typedef Signal KeyEventSignalType; ///< Key event signal type -typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type +typedef Signal TouchEventSignalType; ///< Touch signal type -typedef Signal< void (const TouchEvent&) > TouchSignalType; ///< Touch signal type +typedef Signal WheelEventSignalType; ///< Touched signal type -typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type +typedef Signal VisibilityChangedSignalType; ///< Visibility changed signal type -typedef Signal< void ( Window, bool ) > VisibilityChangedSignalType; ///< Visibility changed signal type +typedef Signal TransitionEffectEventSignalType; ///< Effect signal type and state -typedef Signal< void (Window, EffectState, EffectType) > TransitionEffectEventSignalType; ///< Effect signal type and state - -typedef Signal< void () > KeyboardRepeatSettingsChangedSignalType; ///< Keyboard repeat settings changed signal type +typedef Signal KeyboardRepeatSettingsChangedSignalType; ///< Keyboard repeat settings changed signal type /** * @brief Creates an initialized handle to a new Window. @@ -99,7 +81,7 @@ DALI_ADAPTOR_API Window New(Any surface, PositionSize windowPosition, const std: * @param[in] window The window instance * @param[in] positionSize The new window position and size */ -DALI_ADAPTOR_API void SetPositionSize( Window window, PositionSize positionSize ); +DALI_ADAPTOR_API void SetPositionSize(Window window, PositionSize positionSize); /** * @brief Retrieve the window that the given actor is added to. @@ -107,7 +89,7 @@ DALI_ADAPTOR_API void SetPositionSize( Window window, PositionSize positionSize * @param[in] actor The actor * @return The window the actor is added to or an empty handle if the actor is not added to any window. */ -DALI_ADAPTOR_API Window Get( Actor actor ); +DALI_ADAPTOR_API Window Get(Actor actor); /** * @brief This signal is emitted just after the event processing is finished. @@ -115,7 +97,7 @@ DALI_ADAPTOR_API Window Get( Actor actor ); * @param[in] window The window instance * @return The signal to connect to */ -DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window ); +DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSignal(Window window); /** * @brief This signal is emitted when wheel event is received. @@ -127,7 +109,7 @@ DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSigna * @param[in] window The window instance * @return The signal to connect to */ -DALI_ADAPTOR_API WheelEventSignalType& WheelEventSignal( Window window ); +DALI_ADAPTOR_API WheelEventSignalType& WheelEventSignal(Window window); /** * @brief This signal is emitted when the window is shown or hidden. @@ -139,7 +121,7 @@ DALI_ADAPTOR_API WheelEventSignalType& WheelEventSignal( Window window ); * @param[in] window The window instance * @return The signal to connect to */ -DALI_ADAPTOR_API VisibilityChangedSignalType& VisibilityChangedSignal( Window window ); +DALI_ADAPTOR_API VisibilityChangedSignalType& VisibilityChangedSignal(Window window); /** * @brief This signal is emitted for transition effect. @@ -154,7 +136,7 @@ DALI_ADAPTOR_API VisibilityChangedSignalType& VisibilityChangedSignal( Window wi * @param[in] window The window instance * @return The signal to connect to */ -DALI_ADAPTOR_API TransitionEffectEventSignalType& TransitionEffectEventSignal( Window window ); +DALI_ADAPTOR_API TransitionEffectEventSignalType& TransitionEffectEventSignal(Window window); /** * @brief This signal is emitted just after the keyboard repeat setting is changed globally. @@ -162,7 +144,7 @@ DALI_ADAPTOR_API TransitionEffectEventSignalType& TransitionEffectEventSignal( W * @param[in] window The window instance * @return The signal to connect to */ -DALI_ADAPTOR_API KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal( Window window ); +DALI_ADAPTOR_API KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal(Window window); /** * @brief Sets parent window of the window. @@ -174,7 +156,7 @@ DALI_ADAPTOR_API KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettings * @param[in] window The window instance * @param[in] parent The parent window instance */ -DALI_ADAPTOR_API void SetParent( Window window, Window parent ); +DALI_ADAPTOR_API void SetParent(Window window, Window parent); /** * @brief Unsets parent window of the window. @@ -183,7 +165,7 @@ DALI_ADAPTOR_API void SetParent( Window window, Window parent ); * * @param[in] window The window instance */ -DALI_ADAPTOR_API void Unparent( Window window ); +DALI_ADAPTOR_API void Unparent(Window window); /** * @brief Gets parent window of the window. @@ -191,7 +173,7 @@ DALI_ADAPTOR_API void Unparent( Window window ); * @param[in] window The window instance * @return The parent window of the window */ -DALI_ADAPTOR_API Window GetParent( Window window ); +DALI_ADAPTOR_API Window GetParent(Window window); /** * @brief Downcast sceneHolder to window @@ -199,7 +181,7 @@ DALI_ADAPTOR_API Window GetParent( Window window ); * @param[in] handle The handle need to downcast * @return The window cast from SceneHolder */ -DALI_ADAPTOR_API Window DownCast( BaseHandle handle ); +DALI_ADAPTOR_API Window DownCast(BaseHandle handle); /** * @brief Gets current orientation of the window. @@ -207,7 +189,7 @@ DALI_ADAPTOR_API Window DownCast( BaseHandle handle ); * @param[in] window The window instance * @return The current window orientation if previously set, or none */ -DALI_ADAPTOR_API Dali::Window::WindowOrientation GetCurrentOrientation( Window window ); +DALI_ADAPTOR_API WindowOrientation GetCurrentOrientation(Window window); /** * @brief Sets available orientations of the window. @@ -217,24 +199,14 @@ DALI_ADAPTOR_API Dali::Window::WindowOrientation GetCurrentOrientation( Window w * @param[in] window The window instance * @param[in] orientations The available orientation list to add */ -DALI_ADAPTOR_API void SetAvailableOrientations( Window window, const Dali::Vector& orientations ); +DALI_ADAPTOR_API void SetAvailableOrientations(Window window, const Dali::Vector& orientations); /** * @brief Gets current window ID. * * @param[in] window The window instance */ -DALI_ADAPTOR_API int32_t GetNativeId( Window window ); - -/** - * @brief Sets damaged areas of the window. - * - * This API is for setting static damaged areas of the window for partial update. - * - * @param[in] window The window instance - * @param[in] areas The damaged areas list to set - */ -DALI_ADAPTOR_API void SetDamagedAreas(Window window, std::vector>& areas); +DALI_ADAPTOR_API int32_t GetNativeId(Window window); /** * @brief Adds a callback that is called when the frame rendering is done by the graphics driver. @@ -251,7 +223,7 @@ DALI_ADAPTOR_API void SetDamagedAreas(Window window, std::vector * * @note Ownership of the callback is passed onto this class. */ -DALI_ADAPTOR_API void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId ); +DALI_ADAPTOR_API void AddFrameRenderedCallback(Window window, std::unique_ptr callback, int32_t frameId); /** * @brief Adds a callback that is called when the frame is displayed on the display. @@ -268,7 +240,7 @@ DALI_ADAPTOR_API void AddFrameRenderedCallback( Window window, std::unique_ptr< * * @note Ownership of the callback is passed onto this class. */ -DALI_ADAPTOR_API void AddFramePresentedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId ); +DALI_ADAPTOR_API void AddFramePresentedCallback(Window window, std::unique_ptr callback, int32_t frameId); } // namespace DevelWindow