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
[Tizen] Stage's default background color change to transparent
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
common
/
stage.cpp
diff --git
a/dali/public-api/common/stage.cpp
b/dali/public-api/common/stage.cpp
index
99d3c66
..
8a87625
100644
(file)
--- a/
dali/public-api/common/stage.cpp
+++ b/
dali/public-api/common/stage.cpp
@@
-31,7
+31,7
@@
namespace Dali
using Internal::Core;
using Internal::Core;
-const Vector4 Stage::DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f,
1
.0f);
+const Vector4 Stage::DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f,
0
.0f);
const Vector4 Stage::DEBUG_BACKGROUND_COLOR(0.2f, 0.5f, 0.2f, 1.0f);
Stage::Stage()
const Vector4 Stage::DEBUG_BACKGROUND_COLOR(0.2f, 0.5f, 0.2f, 1.0f);
Stage::Stage()
@@
-122,8
+122,10
@@
Vector2 Stage::GetDpi() const
ObjectRegistry Stage::GetObjectRegistry() const
{
ObjectRegistry Stage::GetObjectRegistry() const
{
- Internal::ObjectRegistry& internal = Internal::Stage::GetCurrent()->GetObjectRegistry();
+ Internal::Stage* stage = Internal::Stage::GetCurrent();
+ DALI_ASSERT_ALWAYS( stage && "GetObjectRegistry() : Stage is null" );
+ Internal::ObjectRegistry& internal = stage->GetObjectRegistry();
return ObjectRegistry(&internal);
}
return ObjectRegistry(&internal);
}
@@
-144,9
+146,16
@@
Stage::EventProcessingFinishedSignalType& Stage::EventProcessingFinishedSignal()
Stage::TouchedSignalType& Stage::TouchedSignal()
{
Stage::TouchedSignalType& Stage::TouchedSignal()
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
return GetImplementation(*this).TouchedSignal();
}
return GetImplementation(*this).TouchedSignal();
}
+Stage::TouchSignalType& Stage::TouchSignal()
+{
+ return GetImplementation( *this ).TouchSignal();
+}
+
Stage::WheelEventSignalType& Stage::WheelEventSignal()
{
return GetImplementation(*this).WheelEventSignal();
Stage::WheelEventSignalType& Stage::WheelEventSignal()
{
return GetImplementation(*this).WheelEventSignal();