TouchInstinct
/
FSCalendar
309
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue setting pagingEnabled in IB 

Fix issue setting pagingEnabled in IB
This commit is contained in:
Wenchao Ding 2016-04-19 11:37:08 +08:00
parent 89cda53392
commit 21442addb5
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
FSCalendar/FSCalendar.m
View File

@ -171,8 +171,14 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
_firstWeekday = 1;
[self invalidateDateTools];
#if TARGET_INTERFACE_BUILDER
_minimumDate = [self beginingOfMonthOfDate:[NSDate date]];
_maximumDate = [self dateByAddingMonths:4 toDate:_minimumDate];
#else
_minimumDate = [self dateWithYear:1970 month:1 day:1];
_maximumDate = [self dateWithYear:2099 month:12 day:31];
#endif
_headerHeight = FSCalendarAutomaticDimension;
_weekdayHeight = FSCalendarAutomaticDimension;
@ -1384,7 +1390,11 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
- (BOOL)hasValidateVisibleLayout
{
return self.superview && !CGSizeEqualToSize(_collectionView.frame.size, CGSizeZero) && !CGSizeEqualToSize(_collectionView.contentSize, CGSizeZero);
#if TARGET_INTERFACE_BUILDER
return YES;
#else
return self.superview && !CGRectIsEmpty(_collectionView.frame) && !CGSizeEqualToSize(_collectionView.contentSize, CGSizeZero);
#endif
}
- (void)invalidateDateTools
@ -1879,6 +1889,9 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
- (NSDate *)minimumDateForCalendar
{
#if TARGET_INTERFACE_BUILDER
return [NSDate date];
#else
if (_dataSource && [_dataSource respondsToSelector:@selector(minimumDateForCalendar:)]) {
_minimumDate = [self dateByIgnoringTimeComponentsOfDate:[_dataSource minimumDateForCalendar:self]];
}
@ -1886,10 +1899,14 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
_minimumDate = [self dateWithYear:1970 month:1 day:1];
}
return _minimumDate;
#endif
}
- (NSDate *)maximumDateForCalendar
{
#if TARGET_INTERFACE_BUILDER
return [self dateByAddingMonths:4 toDate:[NSDate date]];
#else
if (_dataSource && [_dataSource respondsToSelector:@selector(maximumDateForCalendar:)]) {
_maximumDate = [self dateByIgnoringTimeComponentsOfDate:[_dataSource maximumDateForCalendar:self]];
}
@ -1897,6 +1914,7 @@ typedef NS_ENUM(NSUInteger, FSCalendarOrientation) {
_maximumDate = [self dateWithYear:2099 month:12 day:31];
}
return _maximumDate;
#endif
}
@end

4
FSCalendar/FSCalendarConstance.h
View File

@ -29,7 +29,11 @@ UIKIT_EXTERN CGFloat const FSCalendarMaximumEventDotDiameter;
UIKIT_EXTERN NSInteger const FSCalendarDefaultHourComponent;
#if TARGET_INTERFACE_BUILDER
#define FSCalendarDeviceIsIPad NO
#else
#define FSCalendarDeviceIsIPad [[UIDevice currentDevice].model hasPrefix:@"iPad"]
#endif
#define FSCalendarStandardSelectionColor FSColorRGBA(31,119,219,1.0)
#define FSCalendarStandardTodayColor FSColorRGBA(198,51,42 ,1.0)