Skip to content

Fixed #201 #208

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.

Sign up for GitHub

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

Open
dimovskidamjan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed #201 #208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b24a0
Fixed #201
DamjanDimovski Feb 24, 2017
b826884
Merge pull request #1 from dimovskidamjan/hotfix/rotation-fix
dimovskidamjan Feb 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion SwipeView/SwipeView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,14 @@ - (void)updateScrollViewDimensions

if (!CGSizeEqualToSize(_scrollView.contentSize, contentSize))
{
// contentSize is changed, make sure the content offset is adjusted based on the current item index
CGPoint newContentOffset;
if (_vertical) {
newContentOffset = CGPointMake(0.f, _currentItemIndex * _itemSize.height);
} else {
newContentOffset = CGPointMake(_currentItemIndex * _itemSize.width, 0.f);
}
[self setContentOffsetWithoutEvent:newContentOffset];
_scrollView.contentSize = contentSize;
}
}
Expand Down Expand Up @@ -724,11 +732,14 @@ - (void)setContentOffsetWithoutEvent:(CGPoint)contentOffset
{
if (!CGPointEqualToPoint(_scrollView.contentOffset, contentOffset))
{
BOOL old = _suppressScrollEvent;

BOOL animationEnabled = [UIView areAnimationsEnabled];
if (animationEnabled) [UIView setAnimationsEnabled:NO];
_suppressScrollEvent = YES;
_scrollView.contentOffset = contentOffset;
_suppressScrollEvent = NO;
_suppressScrollEvent = old;
if (animationEnabled) [UIView setAnimationsEnabled:YES];
}
}
Expand Down Expand Up @@ -1000,7 +1011,7 @@ - (void)reloadData

//get number of items
[self updateItemSizeAndCount];

//layout views
[self setNeedsLayout];

Expand Down Expand Up @@ -1158,6 +1169,7 @@ - (void)scrollViewDidScroll:(__unused UIScrollView *)scrollView

- (void)scrollViewWillBeginDragging:(__unused UIScrollView *)scrollView
{
_suppressScrollEvent = NO;
[_delegate swipeViewWillBeginDragging:self];

//force refresh
Expand Down Expand Up @@ -1195,6 +1207,7 @@ - (void)scrollViewDidEndDecelerating:(__unused UIScrollView *)scrollView
[self didScroll];

[_delegate swipeViewDidEndDecelerating:self];
_suppressScrollEvent = YES;
}

@end