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
Fix to use width and height correctly in flex-layout-impl.cpp
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
flex-layout-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/flex-layout-impl.cpp
b/dali-toolkit/internal/layouting/flex-layout-impl.cpp
index
8766c58
..
648a7f6
100644
(file)
--- a/
dali-toolkit/internal/layouting/flex-layout-impl.cpp
+++ b/
dali-toolkit/internal/layouting/flex-layout-impl.cpp
@@
-227,12
+227,12
@@
void FlexLayout::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeas
YGNodeStyleSetMaxWidth( mRoot, width );
}
YGNodeStyleSetMaxWidth( mRoot, width );
}
- if (
heightMeasureSpec.GetMode() == MeasureSpec::Mode::EXACTLY
)
+ if (
heightMeasureSpec.GetMode() == MeasureSpec::Mode::EXACTLY
)
{
height = heightMeasureSpec.GetSize();
YGNodeStyleSetHeight( mRoot, height );
}
{
height = heightMeasureSpec.GetSize();
YGNodeStyleSetHeight( mRoot, height );
}
- else if (
widthMeasureSpec.GetMode() == MeasureSpec::Mode::AT_MOST
)
+ else if (
heightMeasureSpec.GetMode() == MeasureSpec::Mode::AT_MOST
)
{
height = heightMeasureSpec.GetSize();
YGNodeStyleSetMaxHeight( mRoot, height );
{
height = heightMeasureSpec.GetSize();
YGNodeStyleSetMaxHeight( mRoot, height );
@@
-306,7
+306,7
@@
YGSize FlexLayout::OnChildMeasure( YGNodeRef node,
if( desiredHeight == Toolkit::ChildLayoutData::MATCH_PARENT )
{
if( desiredHeight == Toolkit::ChildLayoutData::MATCH_PARENT )
{
- if( inner
Width
!= YGUndefined)
+ if( inner
Height
!= YGUndefined)
{
desiredHeight = innerHeight;
}
{
desiredHeight = innerHeight;
}