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
Merge "Provided color-conversion helpers" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
transition-effects
/
cube-transition-effect.cpp
diff --git
a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
index
6ba444e
..
6cd9de4
100644
(file)
--- a/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
+++ b/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.cpp
@@
-35,14
+35,20
@@
CubeTransitionEffect::~CubeTransitionEffect()
{
}
{
}
-CubeTransitionEffect::CubeTransitionEffect(
Internal::CubeTransitionEffect* impl
)
-:
BaseHandle(impl
)
+CubeTransitionEffect::CubeTransitionEffect(
Internal::CubeTransitionEffect& implementation
)
+:
Control( implementation
)
{
}
{
}
+CubeTransitionEffect::CubeTransitionEffect( Dali::Internal::CustomActor* internal )
+: Control( internal )
+{
+ VerifyCustomActorPointer<Internal::CubeTransitionEffect>(internal);
+}
+
CubeTransitionEffect CubeTransitionEffect::DownCast( BaseHandle handle )
{
CubeTransitionEffect CubeTransitionEffect::DownCast( BaseHandle handle )
{
- return C
ubeTransitionEffect( dynamic_cast< Dali::Toolkit::Internal::CubeTransitionEffect* >( handle.GetObjectPtr() )
);
+ return C
ontrol::DownCast<CubeTransitionEffect, Internal::CubeTransitionEffect>( handle
);
}
void CubeTransitionEffect::SetTransitionDuration( float duration )
}
void CubeTransitionEffect::SetTransitionDuration( float duration )
@@
-65,24
+71,19
@@
float CubeTransitionEffect::GetCubeDisplacement() const
return GetImpl(*this).GetCubeDisplacement();
}
return GetImpl(*this).GetCubeDisplacement();
}
-Actor CubeTransitionEffect::GetRoot()
-{
- return GetImpl(*this).GetRoot();
-}
-
-bool CubeTransitionEffect::IsTransiting()
+bool CubeTransitionEffect::IsTransitioning()
{
{
- return GetImpl(*this).IsTransiting();
+ return GetImpl(*this).IsTransiti
oni
ng();
}
}
-void CubeTransitionEffect::SetCurrent
Image(ImageActor imageActor
)
+void CubeTransitionEffect::SetCurrent
Texture( Texture texture
)
{
{
- GetImpl(*this).SetCurrent
Image( imageActor
);
+ GetImpl(*this).SetCurrent
Texture( texture
);
}
}
-void CubeTransitionEffect::SetTarget
Image(ImageActor imageActor
)
+void CubeTransitionEffect::SetTarget
Texture( Texture texture
)
{
{
- GetImpl(*this).SetTarget
Image( imageActor
);
+ GetImpl(*this).SetTarget
Texture( texture
);
}
void CubeTransitionEffect::StartTransition( bool toNextImage )
}
void CubeTransitionEffect::StartTransition( bool toNextImage )