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

iOS layout done

Browse Source
This commit is contained in:
pengfei.zhou
2019-07-31 18:13:22 +08:00
parent b0e34a316b
commit 5c1fc624ce
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
iOS/Pod/Classes/Shader/DoricHLayoutNode.m
View File

@@ -30,7 +30,7 @@ - (void)blendView:(id)view forPropName:(NSString *)name propValue:(id)prop {
- (void)blendChild:(DoricViewNode *)child layoutConfig:(NSDictionary *)layoutconfig {
[super blendChild:child layoutConfig:layoutconfig];
if (![child.layoutParams isKindOfClass:VHLayoutParams.class]) {
DoricLog(@"blend VLayout child error,layout params not match");
DoricLog(@"blend HLayout child error,layout params not match");
return;
}
VHLayoutParams *params = (VHLayoutParams *)child.layoutParams;
@@ -84,8 +84,8 @@ - (void)layoutByParent:(DoricGroupNode *)parent {
if (self.layoutParams.height == LAYOUT_MATCH_PARENT) {
self.height = parent.height;
}
// layotu child
CGFloat xStart = 0, yStart = 0;
// layout child
CGFloat xStart = 0;
if ((self.gravity & LEFT) == LEFT) {
xStart = 0;
} else if ((self.gravity & RIGHT) == RIGHT) {
@@ -94,14 +94,6 @@ - (void)layoutByParent:(DoricGroupNode *)parent {
xStart = (self.width -self.desiredWidth)/2;
}
if ((self.gravity & TOP) == TOP) {
yStart = 0;
} else if ((self.gravity & BOTTOM) == BOTTOM) {
yStart = self.height - self.desiredHeight;
} else if ((self.gravity & CENTER_Y) == CENTER_Y) {
yStart = (self.height -self.desiredHeight)/2;
}
for (DoricViewNode *child in self.indexedChildren) {
if (child.layoutParams.width == LAYOUT_MATCH_PARENT) {
child.width = self.width;
@@ -112,13 +104,13 @@ - (void)layoutByParent:(DoricGroupNode *)parent {
if ([child.layoutParams isKindOfClass:VHLayoutParams.class]) {
VHLayoutParams *layoutParams = (VHLayoutParams *)child.layoutParams;
DoricGravity gravity = layoutParams.alignment;
DoricGravity gravity = layoutParams.alignment | self.gravity;
if ((gravity & TOP) == TOP) {
child.top = yStart;
child.top = 0;
} else if ((gravity & BOTTOM) == BOTTOM) {
child.bottom = yStart + self.desiredHeight;
child.bottom = self.height;
} else if ((gravity & CENTER_Y) == CENTER_Y) {
child.centerY = yStart + self.desiredHeight/2;
child.centerY = self.height/2;
}
}
child.left = xStart;