Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/ChromiumTabs/src/Tab Strip/CTTabStripModel.m

@@ -371,7 +371,7 @@ const int kNoTab = NSNotFound;
 - (void)closeAllTabs {
 	closingAll_ = YES;
 	NSMutableArray *closing_tabs = [NSMutableArray array];
-	for (int i = [self count] - 1; i > 0; --i)
+	for (int i = [self count] - 1; i >= 0; --i)
 		[closing_tabs addObject:[NSNumber numberWithInt:i]];
 	[self internalCloseTabs:closing_tabs closeTypes:CLOSE_CREATE_HISTORICAL_TAB];
 }

PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/KMQucikToolsView.swift

@@ -202,22 +202,31 @@ extension KMQucikToolsView {
     func nextPage() {
         let currentPage = self.currentPage()
         let pageCount = self.pageCount()
+        var point = CGPointZero
+        
         if currentPage < pageCount {
-            self.collectionView.scroll(CGPoint(x: Int(self.collectionView.visibleRect.size.width) * currentPage, y: 0))
-            
-            guard let callBack = pageChange else { return }
-            callBack(self)
+            point = CGPoint(x: Int(self.collectionView.visibleRect.size.width) * currentPage, y: 0)
+        } else {
+            point = CGPoint(x: 0, y: 0)
         }
+        
+        self.collectionView.scroll(point)
+        guard let callBack = pageChange else { return }
+        callBack(self)
     }
     
     func previousPage() {
         let currentPage = self.currentPage()
         let pageCount = self.pageCount()
+        var point = CGPointZero
         if currentPage > 1 {
-            self.collectionView.scroll(CGPoint(x: Int(self.collectionView.visibleRect.size.width) * (currentPage - 2), y: 0))
-            
-            guard let callBack = pageChange else { return }
-            callBack(self)
+            point = CGPoint(x: Int(self.collectionView.visibleRect.size.width) * (currentPage - 2), y: 0)
+        } else {
+            point = CGPoint(x: Int(self.collectionView.visibleRect.size.width) * (pageCount), y: 0)
         }
+        
+        self.collectionView.scroll(point)
+        guard let callBack = pageChange else { return }
+        callBack(self)
     }
 }