day planner view: better handling of timed-events layout invalidation

cattlelovegrass · Nov 8, 2016 · cbf7a49 · cbf7a49
1 parent 3a5efd5
commit cbf7a49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/CalendarLib/MGCDayPlannerView.m b/CalendarLib/MGCDayPlannerView.m
@@ -1548,6 +1548,7 @@ - (void)reloadDimmedTimeRanges
 
     MGCTimedEventsViewLayoutInvalidationContext *context = [MGCTimedEventsViewLayoutInvalidationContext new];
     context.invalidatedSections = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, self.numberOfLoadedDays)];
+    context.invalidateEventCells = NO;
     context.invalidateDimmingViews = YES;
     [self.timedEventsView.collectionViewLayout invalidateLayoutWithContext:context];
 }

diff --git a/CalendarLib/MGCTimedEventsViewLayout.h b/CalendarLib/MGCTimedEventsViewLayout.h
@@ -40,7 +40,8 @@ static NSString* const DimmingViewKind = @"DimmingViewKind";
 @interface MGCTimedEventsViewLayoutInvalidationContext: UICollectionViewLayoutInvalidationContext
 
 @property (nonatomic) BOOL invalidateDimmingViews;  // set to true if layout attributes of dimming views must be recomputed
-@property (nonatomic) NSMutableIndexSet *invalidatedSections;   // sections whose layout attributes must be recomputed
+@property (nonatomic) BOOL invalidateEventCells;  // set to true if layout attributes of event cells must be recomputed
+@property (nonatomic) NSMutableIndexSet *invalidatedSections;   // sections whose layout attributes (dimming views or event cells) must be recomputed - if nil, recompute everything
 
 @end
 

diff --git a/CalendarLib/MGCTimedEventsViewLayout.m b/CalendarLib/MGCTimedEventsViewLayout.m
@@ -54,6 +54,7 @@ @implementation MGCTimedEventsViewLayoutInvalidationContext
 - (instancetype)init {
     if (self = [super init]) {
         self.invalidateDimmingViews = NO;
+        self.invalidateEventCells = YES;
     }
     return self;
 }
@@ -273,15 +274,15 @@ - (void)invalidateLayoutWithContext:(MGCTimedEventsViewLayoutInvalidationContext
 
     }
 
-    if (context.invalidateEverything) {
+    if (context.invalidateEverything || context.invalidatedSections == nil) {
         self.layoutInfo = nil;
     }
     else {
         [context.invalidatedSections enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
             if (context.invalidateDimmingViews) {
-                [self.layoutInfo removeObjectForKey:@(idx)];
+                [[self.layoutInfo objectForKey:@(idx)]removeObjectForKey:DimmingViewsKey];
             }
-            else {
+            if (context.invalidateEventCells) {
                 [[self.layoutInfo objectForKey:@(idx)]removeObjectForKey:EventCellsKey];
             }
         }];
@@ -291,12 +292,8 @@ - (void)invalidateLayoutWithContext:(MGCTimedEventsViewLayoutInvalidationContext
 - (void)invalidateLayout
 {
 	//NSLog(@"invalidateLayout");
-
-    if (!self.ignoreNextInvalidation) {
-        self.layoutInfo = nil;
-    }
 
-	[super invalidateLayout];
+    [super invalidateLayout];
 }
 
 - (CGSize)collectionViewContentSize
@@ -325,7 +322,7 @@ - (NSArray*)layoutAttributesForElementsInRect:(CGRect)rect
 		NSDictionary *layoutDic = [self layoutAttributesForSection:day];
         NSArray *attribs = [[layoutDic objectForKey:DimmingViewsKey]arrayByAddingObjectsFromArray:[layoutDic objectForKey:EventCellsKey]];
 
-		for (MGCEventCellLayoutAttributes *a in attribs) {
+		for (UICollectionViewLayoutAttributes *a in attribs) {
 			if (CGRectIntersectsRect(rect, a.frame)) {
 #ifdef BUG_FIX
 				CGRect frame = a.frame;