X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-impl.h;h=5bc3bb9287e9351f0bbdf9c4a25cc1938b28910c;hb=d6f38dadcefb4a766c84094cd099fa758fadb176;hp=31da82b3aeb3dcc15c1ff90e9390f2997807c634;hpb=308180d6f2f1669b8abb740d9aabe719fca47b36;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h old mode 100644 new mode 100755 index 31da82b..5bc3bb9 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_WINDOWSYSTEM_COMMON_WINDOW_IMPL_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,18 +23,15 @@ #include #include #include - -#ifdef DALI_ADAPTOR_COMPILATION -#include -#else -#include -#endif +#include // INTERNAL INCLUDES #include #include -#include #include +#include +#include +#include namespace Dali { @@ -46,9 +43,7 @@ namespace Internal { namespace Adaptor { -class EventHandler; class Orientation; -class RotationObserver; class WindowRenderSurface; class WindowBase; @@ -60,16 +55,19 @@ using EventHandlerPtr = IntrusivePtr< EventHandler >; /** * Window provides a surface to render onto with orientation & indicator properties. */ -class Window : public Dali::Internal::Adaptor::SceneHolder, public ConnectionTracker +class Window : public Dali::Internal::Adaptor::SceneHolder, public EventHandler::Observer, public ConnectionTracker { 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 Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType; + typedef Dali::DevelWindow::TransitionEffectEventSignalType TransitionEffectEventSignalType; + typedef Dali::DevelWindow::KeyboardRepeatSettingsChangedSignalType KeyboardRepeatSettingsChangedSignalType; typedef Signal< void () > SignalType; /** - * Create a new Window. This should only be called once by the Application class + * @brief Create a new Window. This should only be called once by the Application class * @param[in] positionSize The position and size of the window * @param[in] name The window title * @param[in] className The window class name @@ -79,19 +77,15 @@ public: static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); /** - * @copydoc Dali::Window::ShowIndicator() - */ - void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode ); - - /** - * @copydoc Dali::Window::SetIndicatorBgOpacity() - */ - void SetIndicatorBgOpacity( Dali::Window::IndicatorBgOpacity opacity ); - - /** - * @copydoc Dali::Window::RotateIndicator() + * @brief Create a new Window. This should only be called once by the Application class + * @param[in] surface The surface used to render on. + * @param[in] positionSize The position and size of the window + * @param[in] name The window title + * @param[in] className The window class name + * @param[in] isTransparent Whether window is transparent + * @return A newly allocated Window */ - void RotateIndicator( Dali::Window::WindowOrientation orientation ); + static Window* New(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); /** * @copydoc Dali::Window::SetClass() @@ -130,6 +124,11 @@ public: Dali::Layer GetLayer( uint32_t depth ) const; /** + * @copydoc Dali::DevelWindow::GetRenderTaskList() + */ + Dali::RenderTaskList GetRenderTaskList() const; + + /** * @copydoc Dali::Window::AddAvailableOrientation() */ void AddAvailableOrientation(Dali::Window::WindowOrientation orientation); @@ -140,16 +139,6 @@ public: void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation); /** - * @copydoc Dali::Window::SetAvailableOrientations() - */ - void SetAvailableOrientations(const std::vector& orientations); - - /** - * @copydoc Dali::Window::GetAvailableOrientations() - */ - const std::vector& GetAvailableOrientations(); - - /** * @copydoc Dali::Window::SetPreferredOrientation() */ void SetPreferredOrientation(Dali::Window::WindowOrientation orientation); @@ -160,11 +149,6 @@ public: Dali::Window::WindowOrientation GetPreferredOrientation(); /** - * @copydoc Dali::Window::GetDragAndDropDetector() const - */ - Dali::DragAndDropDetector GetDragAndDropDetector() const; - - /** * @copydoc Dali::Window::SetAcceptFocus() */ void SetAcceptFocus( bool accept ); @@ -330,16 +314,39 @@ public: bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ); /** - * Called from Orientation after the Change signal has been sent + * @copydoc Dali::DevelWindow::Get() + */ + static Dali::Window Get( Dali::Actor actor ); + + /** + * @copydoc Dali::DevelWindow::SetParent() + */ + void SetParent( Dali::Window& parent ); + + /** + * @copydoc Dali::DevelWindow::Unparent() */ - void RotationDone( int orientation, int width, int height ); + void Unparent(); /** - * Set the rotation observer (note, some adaptors may not have a rotation observer) - * @param[in] observer The rotation observer - * @return If the rotation observer is set + * @copydoc Dali::DevelWindow::GetParent() */ - bool SetRotationObserver( RotationObserver* observer ); + Dali::Window GetParent(); + + /** + * @copydoc Dali::DevelWindow::GetCurrentOrientation() + */ + Dali::Window::WindowOrientation GetCurrentOrientation() const; + + /** + * @copydoc Dali::DevelWindow::SetAvailableOrientations() + */ + void SetAvailableOrientations( const Dali::Vector& orientations ); + + /** + * @copydoc Dali::DevelWindow::SetDamagedAreas() + */ + void SetDamagedAreas(std::vector>& areas); public: // Dali::Internal::Adaptor::SceneHolder @@ -353,9 +360,26 @@ public: // Dali::Internal::Adaptor::SceneHolder */ bool IsVisible() const override; + /** + * @copydoc Dali::DevelWindow::GetNativeId() + */ + int32_t GetNativeId() const; + private: /** + * @brief Enumeration for orietation mode. + * The Orientation Mode is related to screen size. + * If screen width is longer than height, the Orientation Mode will have LANDSCAPE. + * Otherwise screen width is shorter than height or same, the Orientation Mode will have PORTRAIT. + */ + enum class OrientationMode + { + PORTRAIT = 0, + LANDSCAPE + }; + + /** * Private constructor. * @sa Window::New() */ @@ -369,7 +393,7 @@ private: /** * Second stage initialization */ - void Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className); + void Initialize(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className); /** * Called when the window becomes iconified or deiconified. @@ -391,22 +415,37 @@ private: */ void OnDeleteRequest(); -private: // Dali::Internal::Adaptor::SceneHolder + /** + * Called when the window receives a Transition effect-start/end event. + */ + void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type ); + + /** + * @brief Called when window receives a keyboard repeat event. + */ + void OnKeyboardRepeatSettingsChanged(); /** - * @copydoc Dali::Internal::Adaptor::SceneHolder::FeedTouchPoint + * @brief Set available orientation to window base. */ - void FeedTouchPoint( TouchPoint& point, int timeStamp ) override; + void SetAvailableAnlges( const std::vector< int >& angles ); /** - * @copydoc Dali::Internal::Adaptor::SceneHolder::FeedWheelEvent + * @brief Convert from window orientation to angle using OrientationMode. */ - void FeedWheelEvent( WheelEvent& wheelEvent ) override; + int ConvertToAngle( Dali::Window::WindowOrientation orientation ); /** - * @copydoc Dali::Internal::Adaptor::SceneHolder::FeedKeyEvent + * @brief Convert from angle to window orientation using OrientationMode. */ - void FeedKeyEvent( KeyEvent& keyEvent ) override; + Dali::Window::WindowOrientation ConvertToOrientation( int angle ) const; + + /** + * @brief Check available window orientation for Available orientation. + */ + bool IsOrientationAvailable( Dali::Window::WindowOrientation orientation ) const; + +private: // Dali::Internal::Adaptor::SceneHolder /** * @copydoc Dali::Internal::Adaptor::SceneHolder::OnAdaptorSet @@ -428,47 +467,73 @@ private: // Dali::Internal::Adaptor::SceneHolder */ void OnResume() override; -public: // Signals + /** + * @copydoc Dali::Internal::Adaptor::SceneHolder::RecalculateTouchPosition + */ + void RecalculateTouchPosition( Integration::Point& point ) override; + +private: // Dali::Internal::Adaptor::EventHandler::Observer /** - * The user should connect to this signal to get a timing when indicator was shown / hidden. + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnTouchPoint */ - IndicatorSignalType& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignal; } + void OnTouchPoint( Dali::Integration::Point& point, int timeStamp ) override; /** - * @copydoc Dali::Window::FocusChangedSignal() + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnWheelEvent */ - FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; } + void OnWheelEvent( Dali::Integration::WheelEvent& wheelEvent ) override; /** + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnKeyEvent + */ + void OnKeyEvent( Dali::Integration::KeyEvent& keyEvent ) override; + + /** + * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnRotation + */ + void OnRotation( const RotationEvent& rotation ) override; + +public: // Signals + + /** + * @copydoc Dali::Window::FocusChangeSignal() + */ + 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 */ SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; } /** - * @copydoc Dali::Window::SignalEventProcessingFinished() + * @copydoc Dali::DevelWindow::VisibilityChangedSignal() */ - Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); }; + VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; } /** - * @copydoc Dali::Window::KeyEventSignal() + * @copydoc Dali::Window::SignalEventProcessingFinished() */ - Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); }; + Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } /** - * @copydoc Dali::Window::TouchSignal() - */ - Dali::DevelWindow::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); }; + * @copydoc Dali::DevelWindow::TransitionEffectEventSignal() + */ + TransitionEffectEventSignalType& TransitionEffectEventSignal() { return mTransitionEffectEventSignal; } /** - * @copydoc Dali::Window::WheelEventSignal() + * @copydoc Dali::DevelWindow::KeyboardRepeatSettingsChangedSignal() */ - Dali::DevelWindow::WheelEventSignalType& WheelEventSignal() { return mScene.WheelEventSignal(); }; + KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal() { return mKeyboardRepeatSettingsChangedSignal; } private: @@ -481,22 +546,31 @@ private: bool mIconified:1; bool mOpaqueState:1; bool mResizeEnabled:1; - Dali::DragAndDropDetector mDragAndDropDetector; Dali::Window::Type mType; + Dali::Window mParentWindow; + + OrientationPtr mOrientation; + std::vector< int > mAvailableAngles; + int mPreferredAngle; - OrientationPtr mOrientation; - std::vector mAvailableOrientations; - Dali::Window::WindowOrientation mPreferredOrientation; + int mRotationAngle; ///< The angle of the rotation + int mWindowWidth; ///< The width of the window + int mWindowHeight; ///< The height of the window EventHandlerPtr mEventHandler; ///< The window events handler - // Signals - IndicatorSignalType mIndicatorVisibilityChangedSignal; - FocusSignalType mFocusChangedSignal; - ResizedSignalType mResizedSignal; - SignalType mDeleteRequestSignal; + OrientationMode mOrientationMode; + int mNativeWindowId; ///< The Native Window Id + // Signals + ResizedSignalType mResizedSignal; + SignalType mDeleteRequestSignal; + FocusChangeSignalType mFocusChangeSignal; + ResizeSignalType mResizeSignal; + VisibilityChangedSignalType mVisibilityChangedSignal; + TransitionEffectEventSignalType mTransitionEffectEventSignal; + KeyboardRepeatSettingsChangedSignalType mKeyboardRepeatSettingsChangedSignal; }; } // namespace Adaptor