From a38bf18fce4a6911484288fff7707e11523f62ed Mon Sep 17 00:00:00 2001 From: Tomas Friml Date: Wed, 22 May 2019 22:31:21 +1200 Subject: [PATCH] Fix for item offset with cellspacing --- CollectionPickerView/Classes/CollectionPickerView.swift | 4 ++-- .../Classes/CollectionPickerViewFlowLayout.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CollectionPickerView/Classes/CollectionPickerView.swift b/CollectionPickerView/Classes/CollectionPickerView.swift index 525221b..3835549 100644 --- a/CollectionPickerView/Classes/CollectionPickerView.swift +++ b/CollectionPickerView/Classes/CollectionPickerView.swift @@ -214,7 +214,7 @@ public class CollectionPickerView: UIView { collectionView, layout: collectionView.collectionViewLayout, sizeForItemAt: indexPath) - offset += (isHorizontal ? cellSize.width : cellSize.height) + offset += (isHorizontal ? cellSize.width : cellSize.height) + cellSpacing } let selectedIndexPath = IndexPath(item: index, section: 0) @@ -423,7 +423,7 @@ extension CollectionPickerView: UICollectionViewDelegateFlowLayout { } public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { - return cellSpacing + return 0 } public func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { diff --git a/CollectionPickerView/Classes/CollectionPickerViewFlowLayout.swift b/CollectionPickerView/Classes/CollectionPickerViewFlowLayout.swift index 172402a..df6971a 100644 --- a/CollectionPickerView/Classes/CollectionPickerViewFlowLayout.swift +++ b/CollectionPickerView/Classes/CollectionPickerViewFlowLayout.swift @@ -138,8 +138,8 @@ public class CollectionPickerViewFlowLayout: UICollectionViewFlowLayout { var mostRecentOffset : CGPoint = CGPoint() public override func targetContentOffset(forProposedContentOffset proposedContentOffset: CGPoint, withScrollingVelocity velocity: CGPoint) -> CGPoint { - _ = scrollDirection == .horizontal - +// _ = scrollDirection == .horizontal +// // if snapToCenter == false { // return super.targetContentOffset(forProposedContentOffset: proposedContentOffset, withScrollingVelocity: velocity) // }