projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Overlay Layer in window
[platform/core/uifw/dali-adaptor.git]
/
dali
/
integration-api
/
adaptor-framework
/
scene-holder-impl.h
diff --git
a/dali/integration-api/adaptor-framework/scene-holder-impl.h
b/dali/integration-api/adaptor-framework/scene-holder-impl.h
index
196e0d9
..
8cb30c3
100644
(file)
--- a/
dali/integration-api/adaptor-framework/scene-holder-impl.h
+++ b/
dali/integration-api/adaptor-framework/scene-holder-impl.h
@@
-84,6
+84,11
@@
public:
Dali::Layer GetRootLayer() const;
/**
Dali::Layer GetRootLayer() const;
/**
+ * @copydoc Dali::Integration::SceneHolder::GetOverlayLayer
+ */
+ Dali::Layer GetOverlayLayer();
+
+ /**
* @brief Gets the window name.
* @return The name of the window
*/
* @brief Gets the window name.
* @return The name of the window
*/
@@
-115,8
+120,10
@@
public:
/**
* @brief Called when the surface set is resized.
/**
* @brief Called when the surface set is resized.
+ * @param[in] width the resized window's width
+ * @param[in] height the resized window's height
*/
*/
- void SurfaceResized();
+ void SurfaceResized(
float width, float height
);
/**
* @brief Get the render surface
/**
* @brief Get the render surface
@@
-165,9
+172,10
@@
public:
*
* @param[in] width The width of rotated surface
* @param[in] height The height of rotated surface
*
* @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, int
o
rientation);
+ void SurfaceRotated(float width, float height, int
32_t windowOrientation, int32_t screenO
rientation);
/**
* @brief Send message to acknowledge window rotation with current window orientation.
/**
* @brief Send message to acknowledge window rotation with current window orientation.
@@
-332,10
+340,14
@@
private: // The following methods can be overridden if required
virtual void OnResume(){};
/**
virtual void OnResume(){};
/**
- * Recalculate the touch position if required
- * @param[in,out] point The touch point
+ * Recalculate the position if required
+ * @param[in] position The screen position
+ * @return converted position by oriention
*/
*/
- virtual void RecalculateTouchPosition(Integration::Point& point){};
+ virtual Vector2 RecalculatePosition(const Vector2& position)
+ {
+ return position;
+ };
private:
/**
private:
/**