From acc504dad3758e5699bf6c640775bb2dbadb9d0f Mon Sep 17 00:00:00 2001 From: Wenchao Ding Date: Mon, 19 Dec 2016 16:16:41 +0800 Subject: [PATCH] Force reject -[UIScrollView(UIScrollViewInternal) _adjustContentOffsetIfNecessary] () --- .../SwiftExample.xcodeproj/project.pbxproj | 26 +++++++++---------- FSCalendar/FSCalendarCollectionView.m | 3 +++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Example-Swift/SwiftExample.xcodeproj/project.pbxproj b/Example-Swift/SwiftExample.xcodeproj/project.pbxproj index cb86dfe..6777219 100644 --- a/Example-Swift/SwiftExample.xcodeproj/project.pbxproj +++ b/Example-Swift/SwiftExample.xcodeproj/project.pbxproj @@ -118,21 +118,28 @@ 30F4C9171E07C3AD00D2EC4D /* FSCalendar */ = { isa = PBXGroup; children = ( - 30F4C9181E07C3AD00D2EC4D /* FSCalendar+Deprecated.m */, 30F4C9191E07C3AD00D2EC4D /* FSCalendar.h */, 30F4C91A1E07C3AD00D2EC4D /* FSCalendar.m */, - 30F4C91B1E07C3AD00D2EC4D /* FSCalendarAnimator.h */, - 30F4C91C1E07C3AD00D2EC4D /* FSCalendarAnimator.m */, 30F4C91D1E07C3AD00D2EC4D /* FSCalendarAppearance.h */, 30F4C91E1E07C3AD00D2EC4D /* FSCalendarAppearance.m */, - 30F4C91F1E07C3AD00D2EC4D /* FSCalendarCalculator.h */, - 30F4C9201E07C3AD00D2EC4D /* FSCalendarCalculator.m */, 30F4C9211E07C3AD00D2EC4D /* FSCalendarCell.h */, 30F4C9221E07C3AD00D2EC4D /* FSCalendarCell.m */, 30F4C9231E07C3AD00D2EC4D /* FSCalendarCollectionView.h */, 30F4C9241E07C3AD00D2EC4D /* FSCalendarCollectionView.m */, 30F4C9251E07C3AD00D2EC4D /* FSCalendarCollectionViewLayout.h */, 30F4C9261E07C3AD00D2EC4D /* FSCalendarCollectionViewLayout.m */, + 30F4C9301E07C3AD00D2EC4D /* FSCalendarHeaderView.h */, + 30F4C9311E07C3AD00D2EC4D /* FSCalendarHeaderView.m */, + 30F4C9321E07C3AD00D2EC4D /* FSCalendarScopeHandle.h */, + 30F4C9331E07C3AD00D2EC4D /* FSCalendarScopeHandle.m */, + 30F4C9341E07C3AD00D2EC4D /* FSCalendarStickyHeader.h */, + 30F4C9351E07C3AD00D2EC4D /* FSCalendarStickyHeader.m */, + 30F4C9361E07C3AD00D2EC4D /* FSCalendarWeekdayView.h */, + 30F4C9371E07C3AD00D2EC4D /* FSCalendarWeekdayView.m */, + 30F4C91B1E07C3AD00D2EC4D /* FSCalendarAnimator.h */, + 30F4C91C1E07C3AD00D2EC4D /* FSCalendarAnimator.m */, + 30F4C91F1E07C3AD00D2EC4D /* FSCalendarCalculator.h */, + 30F4C9201E07C3AD00D2EC4D /* FSCalendarCalculator.m */, 30F4C9271E07C3AD00D2EC4D /* FSCalendarConstants.h */, 30F4C9281E07C3AD00D2EC4D /* FSCalendarConstants.m */, 30F4C9291E07C3AD00D2EC4D /* FSCalendarDelegationFactory.h */, @@ -142,14 +149,7 @@ 30F4C92D1E07C3AD00D2EC4D /* FSCalendarDynamicHeader.h */, 30F4C92E1E07C3AD00D2EC4D /* FSCalendarExtensions.h */, 30F4C92F1E07C3AD00D2EC4D /* FSCalendarExtensions.m */, - 30F4C9301E07C3AD00D2EC4D /* FSCalendarHeaderView.h */, - 30F4C9311E07C3AD00D2EC4D /* FSCalendarHeaderView.m */, - 30F4C9321E07C3AD00D2EC4D /* FSCalendarScopeHandle.h */, - 30F4C9331E07C3AD00D2EC4D /* FSCalendarScopeHandle.m */, - 30F4C9341E07C3AD00D2EC4D /* FSCalendarStickyHeader.h */, - 30F4C9351E07C3AD00D2EC4D /* FSCalendarStickyHeader.m */, - 30F4C9361E07C3AD00D2EC4D /* FSCalendarWeekdayView.h */, - 30F4C9371E07C3AD00D2EC4D /* FSCalendarWeekdayView.m */, + 30F4C9181E07C3AD00D2EC4D /* FSCalendar+Deprecated.m */, 30F4C9381E07C3AD00D2EC4D /* Info.plist */, ); name = FSCalendar; diff --git a/FSCalendar/FSCalendarCollectionView.m b/FSCalendar/FSCalendarCollectionView.m index b3213d6..2e6bb58 100644 --- a/FSCalendar/FSCalendarCollectionView.m +++ b/FSCalendar/FSCalendarCollectionView.m @@ -60,6 +60,9 @@ - (void)setContentInset:(UIEdgeInsets)contentInset { [super setContentInset:UIEdgeInsetsZero]; + if (contentInset.top) { + self.contentOffset = CGPointMake(self.contentOffset.x, self.contentOffset.y+contentInset.top); + } } - (void)setScrollsToTop:(BOOL)scrollsToTop