X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-impl.h;h=0d4a4e10e689b38e97d2a13e9575ee1837ee074c;hb=6e77f2f2c059b23e19ee8387397192431a88232a;hp=5e8ea5b4d6b153fe42f6b7f53b53eb12f261660a;hpb=dece1a6413b51816d7c20bca1cc26f77fe4ba630;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 index 5e8ea5b..0d4a4e1 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -23,18 +23,14 @@ #include #include #include - -#ifdef DALI_ADAPTOR_COMPILATION -#include -#else -#include -#endif +#include // INTERNAL INCLUDES -#include #include #include #include +#include +#include #include namespace Dali @@ -65,10 +61,14 @@ 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 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 @@ -78,6 +78,17 @@ public: static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); /** + * @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 + */ + static Window* New(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false); + + /** * @copydoc Dali::Window::ShowIndicator() */ void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode ); @@ -144,16 +155,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); @@ -348,6 +349,16 @@ public: */ Dali::Window GetParent(); + /** + * @copydoc Dali::DevelWindow::GetCurrentOrientation() + */ + Dali::Window::WindowOrientation GetCurrentOrientation() const; + + /** + * @copydoc Dali::DevelWindow::SetAvailableOrientations() + */ + void SetAvailableOrientations( const Dali::Vector& orientations ); + public: // Dali::Internal::Adaptor::SceneHolder /** @@ -363,6 +374,18 @@ public: // Dali::Internal::Adaptor::SceneHolder 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() */ @@ -376,7 +399,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. @@ -398,6 +421,31 @@ private: */ void OnDeleteRequest(); + /** + * Called when the window receives a Transition effect-start/end event. + */ + void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type ); + + /** + * @brief Set available orientation to window base. + */ + void SetAvailableAnlges( const std::vector< int >& angles ); + + /** + * @brief Convert from window orientation to angle using OrientationMode. + */ + int ConvertToAngle( Dali::Window::WindowOrientation orientation ); + + /** + * @brief Convert from angle to window orientation using OrientationMode. + */ + 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 /** @@ -460,39 +508,38 @@ public: // Signals FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; } /** + * @copydoc Dali::Window::WindowFocusChangedSignal() + */ + FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; } + /** * @copydoc Dali::Window::ResizedSignal() */ ResizedSignalType& ResizedSignal() { return mResizedSignal; } /** - * This signal is emitted when the window is requesting to be deleted + * @copydoc Dali::Window::ResizedSignal() */ - SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; } + ResizeSignalType& ResizeSignal() { return mResizeSignal; } /** - * @copydoc Dali::Window::SignalEventProcessingFinished() + * This signal is emitted when the window is requesting to be deleted */ - Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } + SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; } /** - * @copydoc Dali::Window::KeyEventSignal() + * @copydoc Dali::DevelWindow::VisibilityChangedSignal() */ - Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); } + VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; } /** - * @copydoc Dali::Window::KeyEventGeneratedSignal() + * @copydoc Dali::Window::SignalEventProcessingFinished() */ - Dali::DevelWindow::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); } - - /** - * @copydoc Dali::Window::TouchSignal() - */ - Dali::DevelWindow::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); } + Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); } /** - * @copydoc Dali::Window::WheelEventSignal() + * @copydoc Dali::DevelWindow::TransitionEffectEventSignal() */ - Dali::DevelWindow::WheelEventSignalType& WheelEventSignal() { return mScene.WheelEventSignal(); } + TransitionEffectEventSignalType& TransitionEffectEventSignal() { return mTransitionEffectEventSignal; } private: @@ -508,9 +555,9 @@ private: Dali::Window::Type mType; Dali::Window mParentWindow; - OrientationPtr mOrientation; - std::vector mAvailableOrientations; - Dali::Window::WindowOrientation mPreferredOrientation; + OrientationPtr mOrientation; + std::vector< int > mAvailableAngles; + int mPreferredAngle; int mRotationAngle; ///< The angle of the rotation int mWindowWidth; ///< The width of the window @@ -518,13 +565,19 @@ private: EventHandlerPtr mEventHandler; ///< The window events handler + OrientationMode mOrientationMode; + + int mNativeWindowId; ///< The Native Window Id + // Signals IndicatorSignalType mIndicatorVisibilityChangedSignal; FocusSignalType mFocusChangedSignal; ResizedSignalType mResizedSignal; SignalType mDeleteRequestSignal; - - + FocusChangeSignalType mFocusChangeSignal; + ResizeSignalType mResizeSignal; + VisibilityChangedSignalType mVisibilityChangedSignal; + TransitionEffectEventSignalType mTransitionEffectEventSignal; }; } // namespace Adaptor