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
Size negotiation patch 3: Scope size negotiation enums
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.h
diff --git
a/dali-toolkit/public-api/controls/control-impl.h
b/dali-toolkit/public-api/controls/control-impl.h
index
a816989
..
5c29c39
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.h
+++ b/
dali-toolkit/public-api/controls/control-impl.h
@@
-384,7
+384,7
@@
protected:
/**
* @copydoc Dali::CustomActorImpl::RelayoutDependentOnChildren()
*/
/**
* @copydoc Dali::CustomActorImpl::RelayoutDependentOnChildren()
*/
- virtual bool RelayoutDependentOnChildren( Dimension
dimension =
ALL_DIMENSIONS );
+ virtual bool RelayoutDependentOnChildren( Dimension
::Type dimension = Dimension::
ALL_DIMENSIONS );
private:
private:
@@
-550,12
+550,12
@@
private:
/**
* @copydoc Dali::CustomActorImpl::OnCalculateRelayoutSize()
*/
/**
* @copydoc Dali::CustomActorImpl::OnCalculateRelayoutSize()
*/
- virtual void OnCalculateRelayoutSize( Dimension dimension );
+ virtual void OnCalculateRelayoutSize( Dimension
::Type
dimension );
/**
* @copydoc Dali::CustomActorImpl::OnLayoutNegotiated()
*/
/**
* @copydoc Dali::CustomActorImpl::OnLayoutNegotiated()
*/
- virtual void OnLayoutNegotiated( float size, Dimension dimension );
+ virtual void OnLayoutNegotiated( float size, Dimension
::Type
dimension );
/**
* @copydoc Dali::CustomActorImpl::OnRelayout()
/**
* @copydoc Dali::CustomActorImpl::OnRelayout()
@@
-565,12
+565,12
@@
private:
/**
* @copydoc Dali::CustomActorImpl::OnSetResizePolicy()
*/
/**
* @copydoc Dali::CustomActorImpl::OnSetResizePolicy()
*/
- virtual void OnSetResizePolicy( ResizePolicy
policy, Dimension
dimension );
+ virtual void OnSetResizePolicy( ResizePolicy
::Type policy, Dimension::Type
dimension );
/**
* @copydoc Dali::CustomActorImpl::CalculateChildSize()
*/
/**
* @copydoc Dali::CustomActorImpl::CalculateChildSize()
*/
- virtual float CalculateChildSize( const Dali::Actor& child, Dimension dimension );
+ virtual float CalculateChildSize( const Dali::Actor& child, Dimension
::Type
dimension );
// From CustomActorImpl, derived classes should NOT override these.
// From CustomActorImpl, derived classes should NOT override these.