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 "Size negotiation patch 3: Scope size negotiation enums" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.cpp
diff --git
a/dali-toolkit/public-api/controls/control-impl.cpp
b/dali-toolkit/public-api/controls/control-impl.cpp
index
16b4e67
..
d65c16b
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.cpp
+++ b/
dali-toolkit/public-api/controls/control-impl.cpp
@@
-420,13
+420,13
@@
Vector3 Control::GetNaturalSize()
return mImpl->mNaturalSize;
}
return mImpl->mNaturalSize;
}
-float Control::CalculateChildSize( const Dali::Actor& child, Dimension dimension )
+float Control::CalculateChildSize( const Dali::Actor& child, Dimension
::Type
dimension )
{
// Could be overridden in derived classes.
return CalculateChildSizeBase( child, dimension );
}
{
// Could be overridden in derived classes.
return CalculateChildSizeBase( child, dimension );
}
-bool Control::RelayoutDependentOnChildren( Dimension dimension )
+bool Control::RelayoutDependentOnChildren( Dimension
::Type
dimension )
{
return RelayoutDependentOnChildrenBase( dimension );
}
{
return RelayoutDependentOnChildrenBase( dimension );
}
@@
-900,11
+900,11
@@
void Control::OnControlSizeSet( const Vector3& size )
{
}
{
}
-void Control::OnCalculateRelayoutSize( Dimension dimension )
+void Control::OnCalculateRelayoutSize( Dimension
::Type
dimension )
{
}
{
}
-void Control::OnLayoutNegotiated( float size, Dimension dimension )
+void Control::OnLayoutNegotiated( float size, Dimension
::Type
dimension )
{
}
{
}
@@
-916,7
+916,7
@@
void Control::OnRelayout( const Vector2& size, RelayoutContainer& container )
}
}
}
}
-void Control::OnSetResizePolicy( ResizePolicy
policy, Dimension
dimension )
+void Control::OnSetResizePolicy( ResizePolicy
::Type policy, Dimension::Type
dimension )
{
}
{
}