X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fscene-impl.h;h=cda29a234bcd719f5c00726dce0e1cceb0fc1465;hb=eacc080fe975c523d722dd17c044652317ddd6e8;hp=6686d9d5c3c56107a1312a4662bc97491d0c5938;hpb=55ee7a2d5743e24ea9349b31e3a5d60eef9522de;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/scene-impl.h b/dali/internal/event/common/scene-impl.h index 6686d9d..cda29a2 100644 --- a/dali/internal/event/common/scene-impl.h +++ b/dali/internal/event/common/scene-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_SCENE_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -38,63 +38,9 @@ struct Event; namespace Internal { -//@todo Break this dependence somehow. -namespace Render -{ -class Renderer; -} - namespace SceneGraph { class Scene; - -struct DirtyRect -{ - DirtyRect(Node* node, Render::Renderer* renderer, int32_t frame, Rect& rect) - : node(node), - renderer(renderer), - frame(frame), - rect(rect), - visited(true) - { - } - - DirtyRect() - : node(nullptr), - renderer(nullptr), - frame(0), - rect(), - visited(true) - { - } - - bool operator<(const DirtyRect& rhs) const - { - if(node == rhs.node) - { - if(renderer == rhs.renderer) - { - return frame > rhs.frame; // Most recent rects come first - } - else - { - return renderer < rhs.renderer; - } - } - else - { - return node < rhs.node; - } - } - - Node* node; - Render::Renderer* renderer; - int32_t frame; - - Rect rect; - bool visited; -}; - } // namespace SceneGraph class EventProcessor; @@ -116,7 +62,7 @@ public: /** * @copydoc Dali::Integration::Scene::New */ - static ScenePtr New(Size size, int32_t orientation = 0); + static ScenePtr New(Size size, int32_t windowOrientation = 0, int32_t screenOrientation = 0); /** * virtual destructor @@ -159,6 +105,11 @@ public: Dali::Layer GetRootLayer() const; /** + * @copydoc Dali::Integration::Scene::GetOverlayLayer + */ + Dali::Layer GetOverlayLayer(); + + /** * @copydoc Dali::Integration::Scene::GetLayerCount */ uint32_t GetLayerCount() const; @@ -240,9 +191,10 @@ public: * * @param[in] width The width of rotated surface * @param[in] height The height of rotated surface - * @param[in] orientation The orientation of rotated surface + * @param[in] windowOrientation the current window orientation + * @param[in] screenOrientation the current screen orientation */ - void SurfaceRotated(float width, float height, int32_t orientation); + void SurfaceRotated(float width, float height, int32_t windowOrientation, int32_t screenOrientation); /** * @copydoc Dali::Integration::Scene::SetRotationCompletedAcknowledgement @@ -260,6 +212,11 @@ public: int32_t GetCurrentSurfaceOrientation() const; /** + * @copydoc Dali::Integration::Scene::GetCurrentScreenOrientation + */ + int32_t GetCurrentScreenOrientation() const; + + /** * @copydoc Dali::Integration::Scene::GetCurrentSurfaceRect */ const Rect& GetCurrentSurfaceRect() const; @@ -272,7 +229,7 @@ public: /** * @copydoc Dali::Integration::Scene::SetSurfaceRenderTarget */ - void SetSurfaceRenderTarget(Graphics::RenderTarget* renderTarget); + void SetSurfaceRenderTarget(const Graphics::RenderTargetCreateInfo& renderTargetCreateInfo); /** * Used by the EventProcessor to emit key event signals. @@ -288,6 +245,13 @@ public: bool EmitKeyEventGeneratedSignal(const Dali::KeyEvent& event); /** + * Used by the KeyEventProcessor to emit InterceptKeyEventSignal signals. + * @param[in] event The key event. + * @return The return is true if KeyEvent is consumed, otherwise false. + */ + bool EmitInterceptKeyEventSignal(const Dali::KeyEvent& event); + + /** * Emits the event processing finished signal. * * @see Dali::Scene::SignalEventProcessingFinished() @@ -307,6 +271,13 @@ public: void EmitWheelEventSignal(const Dali::WheelEvent& event); /** + * Used by the WheelEventProcessor to emit WheelEventGenerated signals. + * @param[in] event The wheel event. + * @return The return is true if WheelEvent is consumed, otherwise false. + */ + bool EmitWheelEventGeneratedSignal(const Dali::WheelEvent& event); + + /** * @copydoc Dali::Integration::Scene::AddFrameRenderedCallback */ void AddFrameRenderedCallback(std::unique_ptr callback, int32_t frameId); @@ -337,6 +308,11 @@ public: Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal(); /** + * @copydoc Integration::Scene::InterceptKeyEventSignal() + */ + Integration::Scene::KeyEventGeneratedSignalType& InterceptKeyEventSignal(); + + /** * @copydoc Integration::Scene::SignalEventProcessingFinished() */ Integration::Scene::EventProcessingFinishedSignalType& EventProcessingFinishedSignal(); @@ -352,11 +328,9 @@ public: Integration::Scene::WheelEventSignalType& WheelEventSignal(); /** - * @brief Get ItemsDirtyRects - * - * @return the ItemsDirtyRects + * @copydoc Integration::Scene::WheelEventGeneratedSignal() */ - std::vector& GetItemsDirtyRects(); + Integration::Scene::WheelEventGeneratedSignalType& WheelEventGeneratedSignal(); public: /** @@ -369,7 +343,7 @@ public: * From RenderTaskDefaults; retrieve the default camera actor. * @return The default camera actor. */ - CameraActor& GetDefaultCameraActor() override; + CameraActor& GetDefaultCameraActor() const override; private: // Constructor @@ -379,9 +353,10 @@ private: * Second-phase constructor. * * @param[in] size The size of the set surface - * @param[in] orientation The orientation of the set surface for this scene + * @param[in] windowOrientation The rotated angle of the set surface for this scene + * @param[in] screenOrientation The rotated angle of the screen */ - void Initialize(Size size, int32_t orientation); + void Initialize(Size size, int32_t windowOrientation, int32_t screenOrientation); // Undefined Scene(const Scene&) = delete; @@ -394,9 +369,10 @@ private: * * @param[in] width The width of rotated surface * @param[in] height The height of rotated surface - * @param[in] orientation The orientation of rotated surface + * @param[in] windowOrientation the current window orientation + * @param[in] screenOrientation the current screen orientation */ - void ChangedSurface(float width, float height, int32_t orientation); + void ChangedSurface(float width, float height, int32_t windowOrientation, int32_t screenOrientation); private: Internal::SceneGraph::Scene* mSceneObject; @@ -409,6 +385,8 @@ private: LayerPtr mRootLayer; + LayerPtr mOverlayLayer; + // Ordered list of currently on-stage layers OwnerPointer mLayerList; @@ -424,9 +402,13 @@ private: // The Surface's orientation int32_t mSurfaceOrientation; + // The Screen's orientation + int32_t mScreenOrientation; + // The key event signal Integration::Scene::KeyEventSignalType mKeyEventSignal; Integration::Scene::KeyEventGeneratedSignalType mKeyEventGeneratedSignal; + Integration::Scene::KeyEventGeneratedSignalType mInterceptKeyEventSignal; // The event processing finished signal Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal; @@ -435,9 +417,8 @@ private: Integration::Scene::TouchEventSignalType mTouchedSignal; // The wheel event signal - Integration::Scene::WheelEventSignalType mWheelEventSignal; - - std::vector mItemsDirtyRects; + Integration::Scene::WheelEventSignalType mWheelEventSignal; + Integration::Scene::WheelEventGeneratedSignalType mWheelEventGeneratedSignal; }; } // namespace Internal