Merge pull request #108 from kishikawakatsumi/refactor

kishikawakatsumi · web-flow · commit 6576a10e32b9 · 2019-09-16T21:05:25.000+09:00
Refactor
diff --git a/Sources/IBPCollectionViewCompositionalLayout/IBPCollectionCompositionalLayoutSolver.m b/Sources/IBPCollectionViewCompositionalLayout/IBPCollectionCompositionalLayoutSolver.m
@@ -297,7 +297,7 @@ - (void)solveGroup:(IBPNSCollectionLayoutGroup *)group forContainer:(IBPNSCollec
                     verticalFlexibleSpacingCount++;
                 }
             }
-            if (group.isHorizontalGroup) {
+            if (group.isHorizontalGroup && horizontalFlexibleSpacingCount > 0) {
                 CGFloat actualSpacing = floor((CGRectGetWidth(containerFrame) - totalSize.width) / horizontalFlexibleSpacingCount);
                 CGFloat trailingDelta = 0;
                 for (IBPCollectionCompositionalLayoutSolverResult *result in groupedItemResults) {
@@ -318,7 +318,7 @@ - (void)solveGroup:(IBPNSCollectionLayoutGroup *)group forContainer:(IBPNSCollec
                     result.frame = frame;
                 }
             }
-            if (group.isVerticalGroup) {
+            if (group.isVerticalGroup && verticalFlexibleSpacingCount > 0) {
                 CGFloat actualSpacing = floor((CGRectGetHeight(containerFrame) - totalSize.height) / verticalFlexibleSpacingCount);
                 CGFloat bottomDelta = 0;
                 for (IBPCollectionCompositionalLayoutSolverResult *result in groupedItemResults) {

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ - (void)solveGroup:(IBPNSCollectionLayoutGroup *)group forContainer:(IBPNSCollec`
`297`	`297`	`verticalFlexibleSpacingCount++;`
`298`	`298`	`}`
`299`	`299`	`}`
`300`		`- if (group.isHorizontalGroup) {`
	`300`	`+ if (group.isHorizontalGroup && horizontalFlexibleSpacingCount > 0) {`
`301`	`301`	`CGFloat actualSpacing = floor((CGRectGetWidth(containerFrame) - totalSize.width) / horizontalFlexibleSpacingCount);`
`302`	`302`	`CGFloat trailingDelta = 0;`
`303`	`303`	`for (IBPCollectionCompositionalLayoutSolverResult *result in groupedItemResults) {`
`@@ -318,7 +318,7 @@ - (void)solveGroup:(IBPNSCollectionLayoutGroup *)group forContainer:(IBPNSCollec`
`318`	`318`	`result.frame = frame;`
`319`	`319`	`}`
`320`	`320`	`}`
`321`		`- if (group.isVerticalGroup) {`
	`321`	`+ if (group.isVerticalGroup && verticalFlexibleSpacingCount > 0) {`
`322`	`322`	`CGFloat actualSpacing = floor((CGRectGetHeight(containerFrame) - totalSize.height) / verticalFlexibleSpacingCount);`
`323`	`323`	`CGFloat bottomDelta = 0;`
`324`	`324`	`for (IBPCollectionCompositionalLayoutSolverResult *result in groupedItemResults) {`