Precaution against UnifiedDisplayView flickering

Finer management of rowHeightArray, when a bottom cell get finished before upper cells. Conflicts: src/UnifiedDisplayView.m
ViennaRSS · Apr 5, 2014 · 971ca46 · 971ca46
1 parent 385bc34
commit 971ca46
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/UnifiedDisplayView.m b/src/UnifiedDisplayView.m
@@ -345,7 +345,12 @@ - (void)webViewLoadFinished:(NSNotification *)notification
 					if (row < [rowHeightArray count])
 						[rowHeightArray replaceObjectAtIndex:row withObject:[NSNumber numberWithFloat:fittingHeight]];
 					else
+					{	NSInteger toAdd = row - [rowHeightArray count] ;
+						for (NSInteger i = 0 ; i < toAdd ; i++) {
+							[rowHeightArray addObject:[NSNumber numberWithFloat:DEFAULT_CELL_HEIGHT]];
+						}
 						[rowHeightArray addObject:[NSNumber numberWithFloat:fittingHeight]];
+					}
 					[cell setInProgress:NO];
 					[articleList reloadRowAtIndex:row];
 				}
@@ -927,7 +932,10 @@ - (CGFloat)listView:(PXListView*)aListView heightOfRow:(NSUInteger)row
 	CGFloat height;
 	if (row >= [rowHeightArray count])
 	{
-		[rowHeightArray addObject:[NSNumber numberWithFloat:DEFAULT_CELL_HEIGHT]];
+		NSInteger toAdd = row - [rowHeightArray count] + 1 ;
+		for (NSInteger i = 0 ; i < toAdd ; i++) {
+			[rowHeightArray addObject:[NSNumber numberWithFloat:DEFAULT_CELL_HEIGHT]];
+		}
 		return (CGFloat)DEFAULT_CELL_HEIGHT;
 	}
 	else