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

Layout add minWidth minHeight maxWidth maxHeight

Browse Source
This commit is contained in:
pengfei.zhou
2020-04-11 12:20:43 +08:00
committed by osborn
parent 4e537eed47
commit 80811a3bf6
15 changed files with 228 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,15 @@ - (void)measure:(CGSize)targetSize {
width - self.paddingLeft - self.paddingRight,
height - self.paddingTop - self.paddingBottom)];
if ([self restrainSize]) {
[self measureContent:CGSizeMake(
self.measuredWidth - self.paddingLeft - self.paddingRight,
self.measuredHeight - self.paddingTop - self.paddingBottom)];
}
[self restrainSize];
}
- (BOOL)restrainSize {
BOOL needRemeasure = NO;
if (self.measuredWidth > self.maxWidth) {
self.measuredWidth = self.maxWidth;
@@ -121,11 +130,7 @@ - (void)measure:(CGSize)targetSize {
self.measuredHeight = self.minHeight;
needRemeasure = YES;
}
if (needRemeasure) {
[self measureContent:CGSizeMake(
self.measuredWidth - self.paddingLeft - self.paddingRight,
self.measuredHeight - self.paddingTop - self.paddingBottom)];
}
return needRemeasure;
}
- (void)measureContent:(CGSize)targetSize {

12
doric-iOS/Pod/Classes/Shader/DoricViewNode.m
View File

@@ -430,6 +430,18 @@ - (void)blendLayoutConfig:(NSDictionary *)params {
[params[@"weight"] also:^(NSNumber *it) {
self.view.doricLayout.weight = (DoricGravity) [it integerValue];
}];
[params[@"maxWidth"] also:^(NSNumber *it) {
self.view.doricLayout.maxWidth = (DoricGravity) [it integerValue];
}];
[params[@"maxHeight"] also:^(NSNumber *it) {
self.view.doricLayout.maxHeight = (DoricGravity) [it integerValue];
}];
[params[@"minWidth"] also:^(NSNumber *it) {
self.view.doricLayout.minWidth = (DoricGravity) [it integerValue];
}];
[params[@"minHeight"] also:^(NSNumber *it) {
self.view.doricLayout.minHeight = (DoricGravity) [it integerValue];
}];
}
- (NSDictionary *)transformation {