projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Overlay Layer in scene
[platform/core/uifw/dali-core.git]
/
dali
/
integration-api
/
scene.cpp
diff --git
a/dali/integration-api/scene.cpp
b/dali/integration-api/scene.cpp
index
a5e6236
..
5eedf5c
100644
(file)
--- a/
dali/integration-api/scene.cpp
+++ b/
dali/integration-api/scene.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-30,9
+30,9
@@
namespace Dali
{
namespace Integration
{
{
namespace Integration
{
-Scene Scene::New(Size size, int32_t
o
rientation)
+Scene Scene::New(Size size, int32_t
windowOrientation, int32_t screenO
rientation)
{
{
- Internal::ScenePtr internal = Internal::Scene::New(size,
o
rientation);
+ Internal::ScenePtr internal = Internal::Scene::New(size,
windowOrientation, screenO
rientation);
return Scene(internal.Get());
}
return Scene(internal.Get());
}
@@
-47,13
+47,17
@@
Scene::~Scene() = default;
Scene::Scene(const Scene& handle) = default;
Scene::Scene(const Scene& handle) = default;
+Scene& Scene::operator=(const Scene& rhs) = default;
+
+Scene::Scene(Scene&& handle) = default;
+
+Scene& Scene::operator=(Scene&& rhs) = default;
+
Scene::Scene(Internal::Scene* internal)
: BaseHandle(internal)
{
}
Scene::Scene(Internal::Scene* internal)
: BaseHandle(internal)
{
}
-Scene& Scene::operator=(const Scene& rhs) = default;
-
void Scene::Add(Actor actor)
{
GetImplementation(*this).Add(GetImplementation(actor));
void Scene::Add(Actor actor)
{
GetImplementation(*this).Add(GetImplementation(actor));
@@
-99,6
+103,11
@@
Layer Scene::GetRootLayer() const
return GetImplementation(*this).GetRootLayer();
}
return GetImplementation(*this).GetRootLayer();
}
+Layer Scene::GetOverlayLayer()
+{
+ return GetImplementation(*this).GetOverlayLayer();
+}
+
uint32_t Scene::GetLayerCount() const
{
return GetImplementation(*this).GetLayerCount();
uint32_t Scene::GetLayerCount() const
{
return GetImplementation(*this).GetLayerCount();
@@
-164,9
+173,9
@@
void Scene::GetFramePresentedCallback(FrameCallbackContainer& callbacks)
GetImplementation(*this).GetFramePresentedCallback(callbacks);
}
GetImplementation(*this).GetFramePresentedCallback(callbacks);
}
-void Scene::SurfaceRotated(float width, float height, int32_t
o
rientation)
+void Scene::SurfaceRotated(float width, float height, int32_t
windowOrientation, int32_t screenO
rientation)
{
{
- GetImplementation(*this).SurfaceRotated(width, height,
o
rientation);
+ GetImplementation(*this).SurfaceRotated(width, height,
windowOrientation, screenO
rientation);
}
int32_t Scene::GetCurrentSurfaceOrientation() const
}
int32_t Scene::GetCurrentSurfaceOrientation() const
@@
-174,6
+183,11
@@
int32_t Scene::GetCurrentSurfaceOrientation() const
return GetImplementation(*this).GetCurrentSurfaceOrientation();
}
return GetImplementation(*this).GetCurrentSurfaceOrientation();
}
+int32_t Scene::GetCurrentScreenOrientation() const
+{
+ return GetImplementation(*this).GetCurrentScreenOrientation();
+}
+
const Rect<int32_t>& Scene::GetCurrentSurfaceRect() const
{
return GetImplementation(*this).GetCurrentSurfaceRect();
const Rect<int32_t>& Scene::GetCurrentSurfaceRect() const
{
return GetImplementation(*this).GetCurrentSurfaceRect();
@@
-209,6
+223,11
@@
Scene::KeyEventGeneratedSignalType& Scene::KeyEventGeneratedSignal()
return GetImplementation(*this).KeyEventGeneratedSignal();
}
return GetImplementation(*this).KeyEventGeneratedSignal();
}
+Scene::KeyEventGeneratedSignalType& Scene::InterceptKeyEventSignal()
+{
+ return GetImplementation(*this).InterceptKeyEventSignal();
+}
+
Scene::TouchEventSignalType& Scene::TouchedSignal()
{
return GetImplementation(*this).TouchedSignal();
Scene::TouchEventSignalType& Scene::TouchedSignal()
{
return GetImplementation(*this).TouchedSignal();
@@
-219,6
+238,11
@@
Scene::WheelEventSignalType& Scene::WheelEventSignal()
return GetImplementation(*this).WheelEventSignal();
}
return GetImplementation(*this).WheelEventSignal();
}
+Scene::WheelEventGeneratedSignalType& Scene::WheelEventGeneratedSignal()
+{
+ return GetImplementation(*this).WheelEventGeneratedSignal();
+}
+
} // namespace Integration
} // namespace Dali
} // namespace Integration
} // namespace Dali