Merge pull request #56 from notjosh/bug/trailing-vs-leading

kishikawakatsumi · web-flow · commit e4a502130135 · 2019-08-20T23:28:37.000+09:00
Fix incorrect insets for sections
diff --git a/IBPCollectionViewCompositionalLayout/IBPUICollectionViewCompositionalLayout.m b/IBPCollectionViewCompositionalLayout/IBPUICollectionViewCompositionalLayout.m
@@ -294,11 +294,11 @@ - (void)prepareLayout {
             decorationViewFrame.origin = sectionOrigin;
 
             if (self.scrollDirection == UICollectionViewScrollDirectionVertical) {
-                decorationViewFrame.size.width += CGRectGetWidth(contentFrame) + layoutSection.contentInsets.leading;
-                decorationViewFrame.size.height = CGRectGetMaxY(contentFrame) - sectionOrigin.y + layoutSection.contentInsets.top;
+                decorationViewFrame.size.width += CGRectGetWidth(contentFrame);
+                decorationViewFrame.size.height = CGRectGetMaxY(contentFrame) - sectionOrigin.y + layoutSection.contentInsets.bottom;
             }
             if (self.scrollDirection == UICollectionViewScrollDirectionHorizontal) {
-                decorationViewFrame.size.width = CGRectGetMaxX(contentFrame) - sectionOrigin.x;
+                decorationViewFrame.size.width = CGRectGetMaxX(contentFrame) - sectionOrigin.x + layoutSection.contentInsets.trailing;
                 decorationViewFrame.size.height += CGRectGetHeight(contentFrame);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,11 @@ - (void)prepareLayout {`
`294`	`294`	`decorationViewFrame.origin = sectionOrigin;`
`295`	`295`
`296`	`296`	`if (self.scrollDirection == UICollectionViewScrollDirectionVertical) {`
`297`		`- decorationViewFrame.size.width += CGRectGetWidth(contentFrame) + layoutSection.contentInsets.leading;`
`298`		`- decorationViewFrame.size.height = CGRectGetMaxY(contentFrame) - sectionOrigin.y + layoutSection.contentInsets.top;`
	`297`	`+ decorationViewFrame.size.width += CGRectGetWidth(contentFrame);`
	`298`	`+ decorationViewFrame.size.height = CGRectGetMaxY(contentFrame) - sectionOrigin.y + layoutSection.contentInsets.bottom;`
`299`	`299`	`}`
`300`	`300`	`if (self.scrollDirection == UICollectionViewScrollDirectionHorizontal) {`
`301`		`- decorationViewFrame.size.width = CGRectGetMaxX(contentFrame) - sectionOrigin.x;`
	`301`	`+ decorationViewFrame.size.width = CGRectGetMaxX(contentFrame) - sectionOrigin.x + layoutSection.contentInsets.trailing;`
`302`	`302`	`decorationViewFrame.size.height += CGRectGetHeight(contentFrame);`
`303`	`303`	`}`
`304`	`304`