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
[Tizen] Add codes for Dali Windows Backend
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
linear-layout-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/linear-layout-impl.cpp
b/dali-toolkit/internal/layouting/linear-layout-impl.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
c85c5fe
..
8d8f63b
--- a/
dali-toolkit/internal/layouting/linear-layout-impl.cpp
+++ b/
dali-toolkit/internal/layouting/linear-layout-impl.cpp
@@
-298,7
+298,7
@@
void LinearLayout::LayoutHorizontal( LayoutLength left, LayoutLength top, Layout
auto height = bottom - top;
// Space available for child
auto height = bottom - top;
// Space available for child
- auto childSpace = height -
padding.top -
padding.bottom;
+ auto childSpace = height -
(int)padding.top - (int)
padding.bottom;
auto count = GetChildCount();
auto count = GetChildCount();
@@
-360,24
+360,25
@@
void LinearLayout::LayoutHorizontal( LayoutLength left, LayoutLength top, Layout
{
case Dali::Toolkit::LinearLayout::Alignment::TOP:
{
{
case Dali::Toolkit::LinearLayout::Alignment::TOP:
{
- childTop = LayoutLength( padding.top ) + childMargin.top;
+ childTop = LayoutLength( padding.top ) +
(int)
childMargin.top;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::BOTTOM:
{
break;
}
case Dali::Toolkit::LinearLayout::Alignment::BOTTOM:
{
- childTop = height -
padding.bottom - childHeight -
childMargin.bottom;
+ childTop = height -
(int)padding.bottom - childHeight - (int)
childMargin.bottom;
break;
}
case Dali::Toolkit::LinearLayout::Alignment::CENTER_VERTICAL:
default:
{
break;
}
case Dali::Toolkit::LinearLayout::Alignment::CENTER_VERTICAL:
default:
{
- childTop = LayoutLength( padding.top ) + (
( childSpace - childHeight ) / 2 ) + childMargin.top -
childMargin.bottom;
+ childTop = LayoutLength( padding.top ) + (
int)( ( childSpace - childHeight ) / 2 ) + (int)childMargin.top - (int)
childMargin.bottom;
break;
}
}
break;
}
}
+
childLeft += childMargin.start;
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
childLeft += childMargin.start;
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childLeft += childWidth + childMargin.end + mCellPadding.width;
+ childLeft += childWidth +
(int)
childMargin.end + mCellPadding.width;
}
}
}
}
}
}
@@
-508,7
+509,7
@@
void LinearLayout::LayoutVertical( LayoutLength left, LayoutLength top, LayoutLe
auto width = right - left;
// Space available for child
auto width = right - left;
// Space available for child
- auto childSpace = width -
padding.start -
padding.end;
+ auto childSpace = width -
(int)padding.start - (int)
padding.end;
auto count = GetChildCount();
switch ( mAlignment & VERTICAL_ALIGNMENT_MASK )
auto count = GetChildCount();
switch ( mAlignment & VERTICAL_ALIGNMENT_MASK )
@@
-564,7
+565,7
@@
void LinearLayout::LayoutVertical( LayoutLength left, LayoutLength top, LayoutLe
}
}
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
}
}
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childTop += childHeight + childMargin.bottom + mCellPadding.height;
+ childTop += childHeight +
(int)
childMargin.bottom + mCellPadding.height;
}
}
}
}
}
}