projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8a286e
)
[NUI] remove unnecessary code that flex margin is assigned to flexlayout (#2272)
author
YeongJong Lee
<cleanlyj@naver.com>
Mon, 23 Nov 2020 05:50:07 +0000
(14:50 +0900)
committer
Jiyun Yang
<ji.yang@samsung.com>
Thu, 26 Nov 2020 08:19:50 +0000
(17:19 +0900)
Sicne the margin of FlexLayout will be handled by the parent layout,
we don't need to re-assign margin in `OnMeasure`.
src/Tizen.NUI/src/public/Layouting/FlexLayout.cs
patch
|
blob
|
history
diff --git
a/src/Tizen.NUI/src/public/Layouting/FlexLayout.cs
b/src/Tizen.NUI/src/public/Layouting/FlexLayout.cs
index
1c8dbec
..
b1502f7
100755
(executable)
--- a/
src/Tizen.NUI/src/public/Layouting/FlexLayout.cs
+++ b/
src/Tizen.NUI/src/public/Layouting/FlexLayout.cs
@@
-655,9
+655,7
@@
namespace Tizen.NUI
{
bool isLayoutRtl = Owner.LayoutDirection == ViewLayoutDirectionType.RTL;
Extents padding = Owner.Padding;
- Extents margin = Owner.Margin;
- Interop.FlexLayout.FlexLayout_SetMargin(swigCPtr, Extents.getCPtr(margin));
Interop.FlexLayout.FlexLayout_SetPadding(swigCPtr, Extents.getCPtr(padding));
float width = FlexUndefined; // Behaves as WrapContent (Flex Auto)