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 "Legacy Size negotiation mapper" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
linear-layout.cpp
diff --git
a/dali-toolkit/devel-api/layouting/linear-layout.cpp
b/dali-toolkit/devel-api/layouting/linear-layout.cpp
index
e9e7e5b
..
25e88ab
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/linear-layout.cpp
+++ b/
dali-toolkit/devel-api/layouting/linear-layout.cpp
@@
-57,25
+57,31
@@
LinearLayout& LinearLayout::operator=( const LinearLayout& other )
void LinearLayout::SetCellPadding( LayoutSize size )
{
GetImplementation(*this).SetCellPadding( size );
void LinearLayout::SetCellPadding( LayoutSize size )
{
GetImplementation(*this).SetCellPadding( size );
- GetImplementation(*this).RequestLayout();
}
}
-LayoutSize LinearLayout::GetCellPadding()
+LayoutSize LinearLayout::GetCellPadding()
const
{
return GetImplementation(*this).GetCellPadding();
{
return GetImplementation(*this).GetCellPadding();
- GetImplementation(*this).RequestLayout();
}
void LinearLayout::SetOrientation( LinearLayout::Orientation orientation )
{
GetImplementation(*this).SetOrientation( orientation );
}
void LinearLayout::SetOrientation( LinearLayout::Orientation orientation )
{
GetImplementation(*this).SetOrientation( orientation );
- GetImplementation(*this).RequestLayout();
}
}
-LinearLayout::Orientation LinearLayout::GetOrientation()
+LinearLayout::Orientation LinearLayout::GetOrientation()
const
{
return GetImplementation(*this).GetOrientation();
{
return GetImplementation(*this).GetOrientation();
- GetImplementation(*this).RequestLayout();
+}
+
+void LinearLayout::SetAlignment( unsigned int alignment )
+{
+ GetImplementation(*this).SetAlignment( alignment );
+}
+
+unsigned int LinearLayout::GetAlignment() const
+{
+ return GetImplementation(*this).GetAlignment();
}
LinearLayout::LinearLayout( Dali::Toolkit::Internal::LinearLayout* object )
}
LinearLayout::LinearLayout( Dali::Toolkit::Internal::LinearLayout* object )