-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Table and collection views] Consider content inset when calculating (default) element size range #525
Merged
garrettmoon
merged 6 commits into
TextureGroup:master
from
nguyenhuy:HNPagerContentInset
Aug 22, 2017
Merged
[Table and collection views] Consider content inset when calculating (default) element size range #525
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c8b2cd3
Table and collection views to consider their content inset when calcu…
nguyenhuy f9d6b41
Update CHANGELOG
nguyenhuy 326849b
Address comments
nguyenhuy 1243609
-[ASPagerNode currentPageIndex] to use pageSize instead of bounds
nguyenhuy 74bf005
Update documentation in ASPagerNode
nguyenhuy 13cd95b
Minor change
nguyenhuy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,11 @@ | |
// of the collection view | ||
ASSizeRange NodeConstrainedSizeForScrollDirection(ASCollectionView *collectionView) { | ||
CGSize maxSize = collectionView.bounds.size; | ||
UIEdgeInsets contentInset = collectionView.contentInset; | ||
if (! UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, contentInset)) { | ||
maxSize.width -= (contentInset.left + contentInset.right); | ||
maxSize.height -= (contentInset.top + contentInset.bottom); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same principle as in the pager: I think we should not apply these in the scrolling direction. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
} | ||
if (ASScrollDirectionContainsHorizontalDirection(collectionView.scrollableDirections)) { | ||
maxSize.width = CGFLOAT_MAX; | ||
} else { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to apply the horizontal inset here? It makes perfect sense to me that users would want to account for content inset in the cross direction, but I'm not so sure about the scrolling direction. For example, if they have a 50pt left inset so that the carousel starts off inset by a bit, they probably still want each page to be full-width, since the insets will only be applied at the start/end of the feed, not on every page. Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, good point! I'll fix this.