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

iOS:Text's max width and max height can only be affected while >0

Browse Source
This commit is contained in:
pengfei.zhou 2020-03-25 14:07:24 +08:00 committed by osborn
parent 139a8775d4
commit d088e30f38
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doric-iOS/Pod/Classes/Shader/DoricTextNode.m
View File

@ -39,10 +39,10 @@ - (CGSize)measureSize:(CGSize)targetSize {
CGSize measuredSize = [super measureSize:targetSize]; CGSize measuredSize = [super measureSize:targetSize];
CGFloat measuredWidth = measuredSize.width; CGFloat measuredWidth = measuredSize.width;
CGFloat measuredHeight = measuredSize.height; CGFloat measuredHeight = measuredSize.height;
if (self.maxWidth > 0) { if (self.maxWidth >= 0) {
measuredWidth = MIN(self.maxWidth, measuredSize.width); measuredWidth = MIN(self.maxWidth, measuredSize.width);
} }
if (self.maxHeight > 0) { if (self.maxHeight >= 0) {
measuredHeight = MIN(self.maxHeight, measuredSize.height); measuredHeight = MIN(self.maxHeight, measuredSize.height);
} }
return CGSizeMake(measuredWidth, measuredHeight); return CGSizeMake(measuredWidth, measuredHeight);
@ -55,8 +55,10 @@ @interface DoricTextNode ()
@implementation DoricTextNode @implementation DoricTextNode
- (UILabel *)build { - (UILabel *)build {
return [[[DoricTextView alloc] init] also:^(UILabel *it) { return [[[DoricTextView alloc] init] also:^(DoricTextView *it) {
it.textAlignment = NSTextAlignmentCenter; it.textAlignment = NSTextAlignmentCenter;
it.maxWidth = -1;
it.maxHeight = -1;
}]; }];
} }