tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

iOS:DoricLayout use marginLeft and marginTop instead of x or y

Browse Source
This commit is contained in:
pengfei.zhou
2020-04-08 15:47:10 +08:00
committed by osborn
parent 2a7c7bd27d
commit e689d52f26
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doric-iOS/Pod/Classes/Shader/DoricLayouts.m
View File

@@ -37,8 +37,6 @@ - (DoricLayout *)doricLayout {
layout = [DoricLayout new];
layout.width = self.width;
layout.height = self.height;
layout.x = self.x;
layout.y = self.y;
layout.view = self;
self.doricLayout = layout;
}
@@ -360,7 +358,7 @@ - (void)layoutStack {
if (layout.marginLeft || layout.marginRight) {
layout.measuredX = self.paddingLeft;
} else {
layout.measuredX = layout.x;
layout.measuredX = 0;
}
}
if ((gravity & DoricGravityTop) == DoricGravityTop) {
@@ -373,7 +371,7 @@ - (void)layoutStack {
if (layout.marginTop || layout.marginBottom) {
layout.measuredY = self.paddingTop;
} else {
layout.measuredY = layout.y;
layout.measuredY = 0;
}
}