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
7b3720c
..
b7b05a7
--- a/
dali-toolkit/internal/layouting/linear-layout-impl.cpp
+++ b/
dali-toolkit/internal/layouting/linear-layout-impl.cpp
@@
-280,7
+280,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();
@@
-305,11
+305,11
@@
void LinearLayout::LayoutHorizontal( LayoutLength left, LayoutLength top, Layout
auto childHeight = childLayout->GetMeasuredHeight();
auto childMargin = childLayout->GetMargin();
auto childHeight = childLayout->GetMeasuredHeight();
auto childMargin = childLayout->GetMargin();
- 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;
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;
}
}
}
}
}
}
@@
-440,7
+440,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();
for( unsigned int childIndex = 0; childIndex < count; childIndex++)
auto count = GetChildCount();
for( unsigned int childIndex = 0; childIndex < count; childIndex++)
@@
-453,10
+453,10
@@
void LinearLayout::LayoutVertical( LayoutLength left, LayoutLength top, LayoutLe
auto childMargin = childLayout->GetMargin();
childTop += childMargin.top;
auto childMargin = childLayout->GetMargin();
childTop += childMargin.top;
- childLeft = ( childSpace - childWidth ) / 2 +
childMargin.start -
childMargin.end;
+ childLeft = ( childSpace - childWidth ) / 2 +
(int)childMargin.start - (int)
childMargin.end;
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;
}
}
}
}
}
}