projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove OnControl methods & add up-calls
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
transition-effects
/
cube-transition-effect-impl.cpp
diff --git
a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index
b8ecd96
..
5a76197
100644
(file)
--- a/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@
-270,6
+270,8
@@
void CubeTransitionEffect::Initialize()
void CubeTransitionEffect::OnStageConnection( int depth )
{
void CubeTransitionEffect::OnStageConnection( int depth )
{
+ Control::OnStageConnection( depth );
+
Geometry geometry = CreateQuadGeometry();
Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
Geometry geometry = CreateQuadGeometry();
Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
@@
-306,6
+308,8
@@
void CubeTransitionEffect::OnStageDisconnection()
}
mTargetRenderer.Reset();
}
}
mTargetRenderer.Reset();
}
+
+ Control::OnStageDisconnection();
}
void CubeTransitionEffect::SetTransitionDuration( float duration )
}
void CubeTransitionEffect::SetTransitionDuration( float duration )