Skip to content

Commit

Permalink
功能升级,BUG修复
Browse files Browse the repository at this point in the history
  • Loading branch information
youngsoft committed Oct 18, 2019
1 parent e39e19d commit 7ed4857
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions MyLayout/Lib/MyFlowLayout.m
Original file line number Diff line number Diff line change
Expand Up @@ -2075,22 +2075,22 @@ -(CGSize)myCalcLayoutSizeForHorzOrientation:(CGSize)selfSize sbs:(NSMutableArray

BOOL autoArrange = lsc.autoArrange;
NSInteger arrangedCount = lsc.arrangedCount;
CGFloat xPos = paddingLeading;
CGFloat yPos = paddingTop;
CGFloat colMaxWidth = 0; //每列的最大宽度
CGFloat colMaxHeight = 0; //每列的最大高度
CGFloat maxHeight = paddingTop;
CGFloat maxWidth = paddingLeading; //最大的宽度。

MyGravity vertGravity = lsc.gravity & MyGravity_Horz_Mask;
MyGravity horzGravity = [self myConvertLeftRightGravityToLeadingTrailing:lsc.gravity & MyGravity_Vert_Mask];
MyGravity horzAlign = [self myConvertLeftRightGravityToLeadingTrailing:lsc.arrangedGravity & MyGravity_Vert_Mask];


CGFloat vertSpace = lsc.subviewVSpace;
CGFloat horzSpace = lsc.subviewHSpace;
CGFloat subviewSize = [self myCalcMaxMinSubviewSize:selfSize.height - paddingVert lsc:(MyFlowLayoutViewSizeClass*)lsc arrangedCount:arrangedCount space:&vertSpace];

CGFloat xPos = paddingLeading;
CGFloat yPos = paddingTop;
CGFloat colMaxWidth = 0; //每列的最大宽度
CGFloat colMaxHeight = 0; //每列的最大高度
CGFloat maxHeight = paddingTop;
CGFloat maxWidth = paddingLeading; //最大的宽度。

//父滚动视图是否分页滚动。
#if TARGET_OS_IOS
//判断父滚动视图是否分页滚动
Expand Down

0 comments on commit 7ed4857

Please sign in to comment.