#include <dali/public-api/object/base-object.h>
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#include <dali/integration-api/scene.h>
+#include <dali/public-api/object/property-array.h>
// INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/lifecycle-observer.h>
-#include <dali/internal/adaptor/common/adaptor-impl.h>
-#include <dali/internal/window-system/common/indicator-interface.h>
#include <dali/public-api/adaptor-framework/window.h>
#include <dali/public-api/adaptor-framework/key-grab.h>
-#include <dali/devel-api/adaptor-framework/drag-and-drop-detector.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/window-system/common/event-handler.h>
namespace Dali
{
class Adaptor;
class Actor;
+class RenderSurfaceInterface;
namespace Internal
{
class WindowBase;
class Window;
-typedef IntrusivePtr<Window> WindowPtr;
-typedef IntrusivePtr<Orientation> OrientationPtr;
+using WindowPtr = IntrusivePtr< Window >;
+using OrientationPtr = IntrusivePtr< Orientation >;
+using EventHandlerPtr = IntrusivePtr< EventHandler >;
/**
* Window provides a surface to render onto with orientation & indicator properties.
*/
-class Window : public Dali::BaseObject, public IndicatorInterface::Observer, public LifeCycleObserver, 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 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
static Window* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false);
/**
- * Pass the adaptor back to the overlay. This allows the window to access Core's overlay.
- * @param[in] adaptor An initialized adaptor
- */
- void SetAdaptor(Dali::Adaptor& adaptor);
-
- /**
- * Get the window surface
- * @return The render surface
+ * @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
*/
- WindowRenderSurface* GetSurface();
+ static Window* New(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false);
/**
* @copydoc Dali::Window::ShowIndicator()
void SetIndicatorBgOpacity( Dali::Window::IndicatorBgOpacity opacity );
/**
- * Set the indicator visible mode
- */
- void SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode );
-
- /**
* @copydoc Dali::Window::RotateIndicator()
*/
void RotateIndicator( Dali::Window::WindowOrientation orientation );
void SetClass( std::string name, std::string className );
/**
+ * @brief Gets the window class name.
+ * @return The class of the window
+ */
+ std::string GetClassName() const;
+
+ /**
* @copydoc Dali::Window::Raise()
*/
void Raise();
void Activate();
/**
- * @copydoc Dali::Window::Add()
- */
- void Add( Dali::Actor actor );
-
- /**
- * @copydoc Dali::Window::Remove()
- */
- void Remove( Dali::Actor remove );
-
- /**
- * @copydoc Dali::Window::SetBackgroundColor()
- */
- void SetBackgroundColor(Vector4 color);
-
- /**
- * @copydoc Dali::Window::GetBackgroundColor()
- */
- Vector4 GetBackgroundColor() const;
-
- /**
- * @copydoc Dali::Window::GetRootLayer()
- */
- Dali::Layer GetRootLayer() const;
-
- /**
* @copydoc Dali::Window::GetLayerCount()
*/
uint32_t GetLayerCount() const;
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);
void RemoveAvailableOrientation(Dali::Window::WindowOrientation orientation);
/**
- * @copydoc Dali::Window::SetAvailableOrientations()
- */
- void SetAvailableOrientations(const std::vector<Dali::Window::WindowOrientation>& orientations);
-
- /**
- * @copydoc Dali::Window::GetAvailableOrientations()
- */
- const std::vector<Dali::Window::WindowOrientation>& GetAvailableOrientations();
-
- /**
* @copydoc Dali::Window::SetPreferredOrientation()
*/
void SetPreferredOrientation(Dali::Window::WindowOrientation orientation);
Dali::Window::WindowOrientation GetPreferredOrientation();
/**
- * @copydoc Dali::Window::GetDragAndDropDetector() const
- */
- Dali::DragAndDropDetector GetDragAndDropDetector() const;
-
- /**
- * @copydoc Dali::Window::GetNativeHandle() const
- */
- Dali::Any GetNativeHandle() const;
-
- /**
* @copydoc Dali::Window::SetAcceptFocus()
*/
void SetAcceptFocus( bool accept );
void Hide();
/**
- * @copydoc Dali::Window::IsVisible() const
- */
- bool IsVisible() const;
-
- /**
* @copydoc Dali::Window::GetSupportedAuxiliaryHintCount()
*/
unsigned int GetSupportedAuxiliaryHintCount() const;
void SetPositionSize( PositionSize positionSize );
/**
+ * @copydoc Dali::Window::GetRootLayer()
+ */
+ Dali::Layer GetRootLayer() const;
+
+ /**
* @copydoc Dali::Window::SetTransparency()
*/
void SetTransparency( bool transparent );
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()
*/
- void RotationDone( int orientation, int width, int height );
+ static Dali::Window Get( Dali::Actor actor );
/**
- * @brief Retrieves the unique ID of the window.
- * @return The ID
+ * @copydoc Dali::DevelWindow::SetParent()
*/
- uint32_t GetId() const;
+ void SetParent( Dali::Window& parent );
-private:
+ /**
+ * @copydoc Dali::DevelWindow::Unparent()
+ */
+ void Unparent();
/**
- * Private constructor.
- * @sa Window::New()
+ * @copydoc Dali::DevelWindow::GetParent()
*/
- Window();
+ Dali::Window GetParent();
/**
- * Destructor
+ * @copydoc Dali::DevelWindow::GetCurrentOrientation()
*/
- virtual ~Window();
+ Dali::Window::WindowOrientation GetCurrentOrientation() const;
/**
- * Second stage initialization
+ * @copydoc Dali::DevelWindow::SetAvailableOrientations()
+ */
+ void SetAvailableOrientations( const Dali::Vector<Dali::Window::WindowOrientation>& orientations );
+
+public: // Dali::Internal::Adaptor::SceneHolder
+
+ /**
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::GetNativeHandle
+ */
+ Dali::Any GetNativeHandle() const override;
+
+ /**
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::IsVisible
*/
- void Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className);
+ bool IsVisible() const override;
+
+private:
/**
- * Shows / hides the indicator bar.
- * Handles close/open if rotation changes whilst hidden
+ * @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.
*/
- void DoShowIndicator( Dali::Window::WindowOrientation lastOrientation );
+ enum class OrientationMode
+ {
+ PORTRAIT = 0,
+ LANDSCAPE
+ };
/**
- * Close current indicator and open a connection onto the new indicator service.
- * Effect may not be synchronous if waiting for an indicator update on existing connection.
+ * Private constructor.
+ * @sa Window::New()
*/
- void DoRotateIndicator( Dali::Window::WindowOrientation orientation );
+ Window();
/**
- * Change the indicator actor's rotation to match the current orientation
+ * Destructor
*/
- void SetIndicatorActorRotation();
+ virtual ~Window();
/**
- * Set the indicator properties on the window
+ * Second stage initialization
*/
- void SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation );
+ void Initialize(Any surface, const PositionSize& positionSize, const std::string& name, const std::string& className);
/**
* Called when the window becomes iconified or deiconified.
void OnDeleteRequest();
/**
- * Called when the Ecore indicator event is received.
+ * 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.
*/
- void OnIndicatorFlicked();
+ bool IsOrientationAvailable( Dali::Window::WindowOrientation orientation ) const;
-private: // IndicatorInterface::Observer interface
+private: // Dali::Internal::Adaptor::SceneHolder
/**
- * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorTypeChanged()
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::OnAdaptorSet
*/
- virtual void IndicatorTypeChanged( IndicatorInterface::Type type );
+ void OnAdaptorSet( Dali::Adaptor& adaptor ) override;
/**
- * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorClosed()
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::OnSurfaceSet
*/
- virtual void IndicatorClosed( IndicatorInterface* indicator);
+ void OnSurfaceSet( Dali::RenderSurfaceInterface* surface ) override;
/**
- * @copydoc Dali::Internal::Adaptor::IndicatorInterface::Observer::IndicatorVisibilityChanged()
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::OnPause
*/
- virtual void IndicatorVisibilityChanged( bool isVisible );
+ void OnPause() override;
-private: // Adaptor::Observer interface
+ /**
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::OnResume
+ */
+ void OnResume() override;
/**
- * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStart()
+ * @copydoc Dali::Internal::Adaptor::SceneHolder::RecalculateTouchPosition
*/
- virtual void OnStart();
+ void RecalculateTouchPosition( Integration::Point& point ) override;
+
+private: // Dali::Internal::Adaptor::EventHandler::Observer
/**
- * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnPause()
+ * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnTouchPoint
*/
- virtual void OnPause();
+ void OnTouchPoint( Dali::Integration::Point& point, int timeStamp ) override;
/**
- * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnResume()
+ * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnWheelEvent
*/
- virtual void OnResume();
+ void OnWheelEvent( Dali::Integration::WheelEvent& wheelEvent ) override;
/**
- * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnStop()
+ * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnKeyEvent
*/
- virtual void OnStop();
+ void OnKeyEvent( Dali::Integration::KeyEvent& keyEvent ) override;
/**
- * @copydoc Dali::Internal::Adaptor::Adaptor::Observer::OnDestroy()
+ * @copydoc Dali::Internal::Adaptor::EventHandler::Observer::OnRotation
*/
- virtual void OnDestroy();
+ void OnRotation( const RotationEvent& rotation ) override;
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
*/
SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; }
+ /**
+ * @copydoc Dali::DevelWindow::VisibilityChangedSignal()
+ */
+ VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; }
+
+ /**
+ * @copydoc Dali::Window::SignalEventProcessingFinished()
+ */
+ Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); }
+
+ /**
+ * @copydoc Dali::DevelWindow::TransitionEffectEventSignal()
+ */
+ TransitionEffectEventSignalType& TransitionEffectEventSignal() { return mTransitionEffectEventSignal; }
+
private:
- static uint32_t mWindowCounter; ///< A counter to track the window creation
- uint32_t mId; ///< A unique ID to identify the window starting from 0
- std::unique_ptr< WindowRenderSurface > mSurface;
- Dali::Integration::Scene mScene;
+ WindowRenderSurface* mWindowSurface; ///< The window rendering surface
WindowBase* mWindowBase;
- Dali::Window::IndicatorVisibleMode mIndicatorVisible; ///< public state
- bool mIndicatorIsShown:1; ///< private state
- bool mShowRotatedIndicatorOnClose:1;
- bool mStarted:1;
+ std::string mName;
+ std::string mClassName;
bool mIsTransparent:1;
bool mIsFocusAcceptable:1;
- bool mVisible:1;
bool mIconified:1;
bool mOpaqueState:1;
bool mResizeEnabled:1;
- std::unique_ptr< IndicatorInterface > mIndicator;
- Dali::Window::WindowOrientation mIndicatorOrientation;
- Dali::Window::WindowOrientation mNextIndicatorOrientation;
- Dali::Window::IndicatorBgOpacity mIndicatorOpacityMode;
- Adaptor* mAdaptor;
- Dali::DragAndDropDetector mDragAndDropDetector;
Dali::Window::Type mType;
+ Dali::Window mParentWindow;
+
+ OrientationPtr mOrientation;
+ std::vector< int > mAvailableAngles;
+ int mPreferredAngle;
+
+ 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
- OrientationPtr mOrientation;
- std::vector<Dali::Window::WindowOrientation> mAvailableOrientations;
- Dali::Window::WindowOrientation mPreferredOrientation;
+ OrientationMode mOrientationMode;
- Vector4 mBackgroundColor;
+ int mNativeWindowId; ///< The Native Window Id
// Signals
- IndicatorSignalType mIndicatorVisibilityChangedSignal;
- FocusSignalType mFocusChangedSignal;
- ResizedSignalType mResizedSignal;
- SignalType mDeleteRequestSignal;
+ IndicatorSignalType mIndicatorVisibilityChangedSignal;
+ FocusSignalType mFocusChangedSignal;
+ ResizedSignalType mResizedSignal;
+ SignalType mDeleteRequestSignal;
+ FocusChangeSignalType mFocusChangeSignal;
+ ResizeSignalType mResizeSignal;
+ VisibilityChangedSignalType mVisibilityChangedSignal;
+ TransitionEffectEventSignalType mTransitionEffectEventSignal;
};
} // namespace Adaptor
projects / platform / core / uifw / dali-adaptor.git / blobdiff