collectionViewDay working fine in landscape mode

kevingod · May 30, 2014 · e8f63da · e8f63da
1 parent 0405100
commit e8f63da
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...deproj/project.xcworkspace/xcuserdata/hivedev2.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/hivedev2.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FFCalendar/FFCalendars/FFDayCalendarView/FFDayCalendarView.m b/FFCalendar/FFCalendars/FFDayCalendarView/FFDayCalendarView.m
@@ -88,7 +88,7 @@ - (void)setDictEvents:(NSMutableDictionary *)_dictEvents {
 - (void)invalidateLayout {
     [collectionViewHeaderDay.collectionViewLayout invalidateLayout];
     [dayContainerScroll.collectionViewDay.collectionViewLayout invalidateLayout];
-    [self updateHeader];
+    [self dateChanged:nil];
 }
 
 #pragma mark - FFDateManager Notification
@@ -152,7 +152,7 @@ - (void)showViewDetailsWithEvent:(FFEvent *)_event cell:(UICollectionViewCell *)
     [viewDetail removeFromSuperview];
     viewDetail = nil;
 
-   viewDetail = [[FFEventDetailView alloc] initWithFrame:CGRectMake(self.frame.size.width/2., HEADER_HEIGHT_SCROLL, self.frame.size.width/2., self.frame.size.height-HEADER_HEIGHT_SCROLL) event:_event];
+    viewDetail = [[FFEventDetailView alloc] initWithFrame:CGRectMake(self.frame.size.width/2., HEADER_HEIGHT_SCROLL, self.frame.size.width/2., self.frame.size.height-HEADER_HEIGHT_SCROLL) event:_event];
     [viewDetail setAutoresizingMask:AR_WIDTH_HEIGHT | UIViewAutoresizingFlexibleLeftMargin];
     [viewDetail setProtocol:self];
     [self addSubview:viewDetail];

diff --git a/...r/FFCalendars/FFDayCalendarView/FFDayScrollView/FFDayCollectionView/FFDayCollectionView.m b/...r/FFCalendars/FFDayCalendarView/FFDayScrollView/FFDayCollectionView/FFDayCollectionView.m
@@ -55,7 +55,7 @@ - (id)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *
         boolGoNext = NO;
         boolGoPrevious = NO;
 
-        [self setAutoresizingMask:AR_WIDTH_HEIGHT];
+        [self setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
     }
     return self;
 }

diff --git a/FFCalendar/FFCalendars/FFDayCalendarView/FFDayScrollView/FFDayScrollView.m b/FFCalendar/FFCalendars/FFDayCalendarView/FFDayScrollView/FFDayScrollView.m
@@ -53,14 +53,14 @@ - (void)setDictEvents:(NSMutableDictionary *)_dictEvents {
 
         FFViewWithHourLines *viewWithHourLines = [[FFViewWithHourLines alloc] initWithFrame:CGRectZero];
 
-        collectionViewDay = [[FFDayCollectionView alloc] initWithFrame:CGRectMake(10.,0.,self.frame.size.width-10,viewWithHourLines.totalHeight)collectionViewLayout:[UICollectionViewFlowLayout new]];
+        collectionViewDay = [[FFDayCollectionView alloc] initWithFrame:CGRectMake(10.,0.,self.frame.size.width-10,viewWithHourLines.totalHeight+HEIGHT_CELL_HOUR)collectionViewLayout:[UICollectionViewFlowLayout new]];
         [collectionViewDay scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:[NSDate componentsOfDate:[[FFDateManager sharedManager] currentDate]].day-1+7 inSection:0] atScrollPosition:UICollectionViewScrollPositionLeft animated:NO];
         [self addSubview:collectionViewDay];
 
         labelWithActualHour = [viewWithHourLines labelWithCurrentHourWithWidth:self.frame.size.width];
         [labelWithActualHour setFrame:CGRectMake(labelWithActualHour.frame.origin.x, labelWithActualHour.frame.origin.y+viewWithHourLines.frame.origin.y, labelWithActualHour.frame.size.width, labelWithActualHour.frame.size.height)];
 
-        [self setContentSize:CGSizeMake(self.frame.size.width, collectionViewDay.frame.origin.y+collectionViewDay.frame.size.height)];
+        [self setContentSize:CGSizeMake(self.frame.size.width, collectionViewDay.frame.origin.y+collectionViewDay.frame.size.height-HEIGHT_CELL_HOUR)];
         [self scrollRectToVisible:CGRectMake(0, labelWithActualHour.frame.origin.y, self.frame.size.width, self.frame.size.height) animated:NO];
     }