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

Add direction switch fo header 

Add direction switch for header
This commit is contained in:
Wenchao Ding 2015-03-16 17:37:32 +08:00
parent 041254fa0a
commit 1d8ecb49dc
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Pod/Classes/FSCalendar.m
View File

@ -602,13 +602,7 @@
- (void)reloadData
{
NSIndexPath *selectedPath = [_collectionView indexPathsForSelectedItems].lastObject;
[_collectionView reloadData];
[_collectionView selectItemAtIndexPath:selectedPath animated:NO scrollPosition:UICollectionViewScrollPositionNone];
_header.titleFont = self.headerTitleFont;
_header.titleColor = self.headerTitleColor;
_header.scrollDirection = self.collectionViewFlowLayout.scrollDirection;
[_header reloadData];
[self reloadData:selectedPath];
}
#pragma mark - Private
@ -732,15 +726,15 @@
- (void)reloadData:(NSIndexPath *)selection
{
if (selection) {
[_collectionView reloadData];
[_collectionView selectItemAtIndexPath:selection
animated:NO
scrollPosition:UICollectionViewScrollPositionNone];
} else {
[self reloadData];
}
[_collectionView reloadData];
[_collectionView selectItemAtIndexPath:selection animated:NO scrollPosition:UICollectionViewScrollPositionNone];
[_weekdays setValue:_weekdayFont forKey:@"font"];
_header.titleFont = self.headerTitleFont;
_header.titleColor = self.headerTitleColor;
_header.scrollDirection = self.collectionViewFlowLayout.scrollDirection;
[_header reloadData];
}
@end

4
Pod/Classes/FSCalendarHeader.m
View File

@ -161,8 +161,8 @@
_scrollDirection = scrollDirection;
_collectionViewFlowLayout.scrollDirection = scrollDirection;
CGPoint newOffset = CGPointMake(
scrollDirection == UICollectionViewScrollDirectionHorizontal ? _scrollOffset * _collectionView.fs_width : 0,
scrollDirection == UICollectionViewScrollDirectionVertical ? _scrollOffset * _collectionView.fs_height : 0
scrollDirection == UICollectionViewScrollDirectionHorizontal ? (_scrollOffset-0.5)*_collectionViewFlowLayout.itemSize.width : 0,
scrollDirection == UICollectionViewScrollDirectionVertical ? _scrollOffset * _collectionViewFlowLayout.itemSize.height : 0
);
_collectionView.contentOffset = newOffset;
if (scrollDirection == UICollectionViewScrollDirectionVertical) {