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

iOS avoid set frame twice

Browse Source
This commit is contained in:
pengfei.zhou 2020-03-21 17:03:52 +08:00 committed by osborn
parent 8f4f866bcb
commit 29402662ef
1 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,26 +253,28 @@ - (void)layoutSelf:(CGSize)targetSize {
targetSize.height - padding.top - padding.bottom)]; targetSize.height - padding.top - padding.bottom)];
[child layoutSelf:size]; [child layoutSelf:size];
DoricGravity gravity = childConfig.alignment; DoricGravity gravity = childConfig.alignment;
CGPoint point = child.frame.origin;
if ((gravity & LEFT) == LEFT) { if ((gravity & LEFT) == LEFT) {
child.left = padding.left; point.x = padding.left;
} else if ((gravity & RIGHT) == RIGHT) { } else if ((gravity & RIGHT) == RIGHT) {
child.right = targetSize.width - padding.right; point.x = targetSize.width - padding.right - child.width;
} else if ((gravity & CENTER_X) == CENTER_X) { } else if ((gravity & CENTER_X) == CENTER_X) {
child.centerX = targetSize.width / 2; point.x = targetSize.width / 2 - child.width / 2;
} else { } else {
if (childConfig.margin.left || childConfig.margin.right) { if (childConfig.margin.left || childConfig.margin.right) {
child.left = padding.left; point.x = padding.left;
} }
} }
if ((gravity & TOP) == TOP) { if ((gravity & TOP) == TOP) {
child.top = padding.top; point.y = padding.top;
} else if ((gravity & BOTTOM) == BOTTOM) { } else if ((gravity & BOTTOM) == BOTTOM) {
child.bottom = targetSize.height - padding.bottom; point.y = targetSize.height - padding.bottom - child.height;
} else if ((gravity & CENTER_Y) == CENTER_Y) { } else if ((gravity & CENTER_Y) == CENTER_Y) {
child.centerY = targetSize.height / 2; point.y = targetSize.height / 2 - child.height / 2;
} else { } else {
if (childConfig.margin.top || childConfig.margin.bottom) { if (childConfig.margin.top || childConfig.margin.bottom) {
child.top = padding.top; point.y = padding.top;
} }
} }
@ -280,16 +282,22 @@ - (void)layoutSelf:(CGSize)targetSize {
gravity = LEFT | TOP; gravity = LEFT | TOP;
} }
if (childConfig.margin.left && !((gravity & RIGHT) == RIGHT)) { if (childConfig.margin.left && !((gravity & RIGHT) == RIGHT)) {
child.left += childConfig.margin.left; point.x += childConfig.margin.left;
} }
if (childConfig.margin.right && !((gravity & LEFT) == LEFT)) { if (childConfig.margin.right && !((gravity & LEFT) == LEFT)) {
child.right -= childConfig.margin.right; point.x -= childConfig.margin.right;
} }
if (childConfig.margin.top && !((gravity & BOTTOM) == BOTTOM)) { if (childConfig.margin.top && !((gravity & BOTTOM) == BOTTOM)) {
child.top += childConfig.margin.top; point.y += childConfig.margin.top;
} }
if (childConfig.margin.bottom && !((gravity & TOP) == TOP)) { if (childConfig.margin.bottom && !((gravity & TOP) == TOP)) {
child.bottom -= childConfig.margin.bottom; point.y -= childConfig.margin.bottom;
}
if (point.x != child.x) {
child.x = point.x;
}
if (point.y != child.y) {
child.y = point.y;
} }
} }
} }
@ -365,23 +373,27 @@ - (void)layoutSelf:(CGSize)targetSize {
} }
[child layoutSelf:size]; [child layoutSelf:size];
DoricGravity gravity = childConfig.alignment | self.gravity; DoricGravity gravity = childConfig.alignment | self.gravity;
CGPoint point = child.frame.origin;
if ((gravity & LEFT) == LEFT) { if ((gravity & LEFT) == LEFT) {
child.left = padding.left; point.x = padding.left;
} else if ((gravity & RIGHT) == RIGHT) { } else if ((gravity & RIGHT) == RIGHT) {
child.right = self.width - padding.right; point.x = targetSize.width - padding.right - child.width;
} else if ((gravity & CENTER_X) == CENTER_X) { } else if ((gravity & CENTER_X) == CENTER_X) {
child.centerX = targetSize.width / 2; point.x = targetSize.width / 2 - child.width / 2;
} else { } else {
child.left = padding.left; point.x = padding.left;
} }
if (!gravity) { if (!gravity) {
gravity = LEFT; gravity = LEFT;
} }
if (childConfig.margin.left && !((gravity & RIGHT) == RIGHT)) { if (childConfig.margin.left && !((gravity & RIGHT) == RIGHT)) {
child.left += childConfig.margin.left; point.x += childConfig.margin.left;
} }
if (childConfig.margin.right && !((gravity & LEFT) == LEFT)) { if (childConfig.margin.right && !((gravity & LEFT) == LEFT)) {
child.right -= childConfig.margin.right; point.x -= childConfig.margin.right;
}
if (point.x != child.x) {
child.x = point.x;
} }
if (childConfig.margin.top) { if (childConfig.margin.top) {
yStart += childConfig.margin.top; yStart += childConfig.margin.top;
@ -465,25 +477,29 @@ - (void)layoutSelf:(CGSize)targetSize {
[child layoutSelf:size]; [child layoutSelf:size];
DoricGravity gravity = childConfig.alignment | self.gravity; DoricGravity gravity = childConfig.alignment | self.gravity;
CGPoint point = child.frame.origin;
if ((gravity & TOP) == TOP) { if ((gravity & TOP) == TOP) {
child.top = padding.top; point.y = padding.top;
} else if ((gravity & BOTTOM) == BOTTOM) { } else if ((gravity & BOTTOM) == BOTTOM) {
child.bottom = targetSize.height - padding.bottom; point.y = targetSize.height - padding.bottom - child.height;
} else if ((gravity & CENTER_Y) == CENTER_Y) { } else if ((gravity & CENTER_Y) == CENTER_Y) {
child.centerY = targetSize.height / 2; point.y = targetSize.height / 2 - child.height / 2;
} else { } else {
child.top = padding.top; point.y = padding.top;
} }
if (!gravity) { if (!gravity) {
gravity = TOP; gravity = TOP;
} }
if (childConfig.margin.top && !((gravity & BOTTOM) == BOTTOM)) { if (childConfig.margin.top && !((gravity & BOTTOM) == BOTTOM)) {
child.top += childConfig.margin.top; point.y += childConfig.margin.top;
} }
if (childConfig.margin.bottom && !((gravity & TOP) == TOP)) { if (childConfig.margin.bottom && !((gravity & TOP) == TOP)) {
child.bottom -= childConfig.margin.bottom; point.y -= childConfig.margin.bottom;
}
if (point.y != child.y) {
child.y = point.y;
} }
if (childConfig.margin.left) { if (childConfig.margin.left) {
xStart += childConfig.margin.left; xStart += childConfig.margin.left;
} }