Merge pull request #4840 from vishalduggal/timob-15095

[TIMOB-15095] Render at end of scroll whenever possible
tidev · Oct 24, 2013 · 9b2cd09 · 9b2cd09
2 parents affad6c + 5dab1b7
commit 9b2cd09
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/iphone/Classes/TiUIScrollableView.h b/iphone/Classes/TiUIScrollableView.h
@@ -28,7 +28,7 @@
     int lastPage;
     BOOL enforceCacheRecalculation;
     int cacheSize;
-
+    BOOL pageChanged;
 }
 
 -(void)manageRotation;

diff --git a/iphone/Classes/TiUIScrollableView.m b/iphone/Classes/TiUIScrollableView.m
@@ -612,15 +612,30 @@ -(void)scrollViewDidScroll:(UIScrollView *)sender
                 minCacheSize = cacheSize;
             }
         }
+        pageChanged = YES;
         cacheSize = minCacheSize;
-		[pageControl setCurrentPage:nextPage];
-		currentPage = nextPage;
-		[self.proxy replaceValue:NUMINT(currentPage) forKey:@"currentPage" notification:NO];
-        [self manageCache:currentPage];
+        [pageControl setCurrentPage:nextPage];
+        currentPage = nextPage;
+        [self.proxy replaceValue:NUMINT(currentPage) forKey:@"currentPage" notification:NO];
         cacheSize = curCacheSize;
     }
 }
 
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
+{
+    if (pageChanged) {
+        [self manageCache:currentPage];
+    }
+}
+
+- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
+{
+    //Since we are now managing cache at end of scroll, ensure quick scroll is disabled to avoid blank screens.
+    if (pageChanged) {
+        [scrollview setUserInteractionEnabled:!decelerate];
+    }
+}
+
 -(void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
 {
 	// called when setContentOffset/scrollRectVisible:animated: finishes. not called if not animating
@@ -654,6 +669,9 @@ -(void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 													   [[self proxy] viewAtIndex:pageNum],@"view",nil]]; 
 	}
 	currentPage=pageNum;
+	[self manageCache:currentPage];
+	pageChanged = NO;
+	[scrollview setUserInteractionEnabled:YES];
 	[pageControl setCurrentPage:pageNum];
 }