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

iOS:fix weight problem

Browse Source
This commit is contained in:
pengfei.zhou 2020-04-09 10:54:38 +08:00 committed by osborn
parent b387491c47
commit c7f3f74b69
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,11 +272,13 @@ - (void)measureVLayoutContent:(CGSize)targetSize {
if (layout.disabled) { if (layout.disabled) {
continue; continue;
} }
layout.measuredHeight += remaining / contentWeight * layout.weight; CGFloat measuredHeight = layout.measuredHeight + remaining / contentWeight * layout.weight;
layout.measuredHeight = measuredHeight;
//Need Remeasure //Need Remeasure
[layout measureContent:CGSizeMake( [layout measureContent:CGSizeMake(
layout.measuredWidth - layout.paddingLeft - layout.paddingRight, layout.measuredWidth - layout.paddingLeft - layout.paddingRight,
layout.measuredHeight - layout.paddingTop - layout.paddingBottom)]; measuredHeight - layout.paddingTop - layout.paddingBottom)];
layout.measuredHeight = measuredHeight;
contentWidth = MAX(contentWidth, layout.takenWidth); contentWidth = MAX(contentWidth, layout.takenWidth);
} }
contentHeight = targetSize.height; contentHeight = targetSize.height;
@ -322,11 +324,13 @@ - (void)measureHLayoutContent:(CGSize)targetSize {
if (layout.disabled) { if (layout.disabled) {
continue; continue;
} }
layout.measuredWidth += remaining / contentWeight * layout.weight; CGFloat measuredWidth = layout.measuredWidth + remaining / contentWeight * layout.weight;
layout.measuredWidth = measuredWidth;
//Need Remeasure //Need Remeasure
[layout measureContent:CGSizeMake( [layout measureContent:CGSizeMake(
layout.measuredWidth - layout.paddingLeft - layout.paddingRight, measuredWidth - layout.paddingLeft - layout.paddingRight,
layout.measuredHeight - layout.paddingTop - layout.paddingBottom)]; layout.measuredHeight - layout.paddingTop - layout.paddingBottom)];
layout.measuredWidth = measuredWidth;
contentHeight = MAX(contentHeight, layout.takenHeight); contentHeight = MAX(contentHeight, layout.takenHeight);
} }
contentWidth = targetSize.width; contentWidth = targetSize.width;