[Skim-app-commit] SF.net SVN: skim-app:[16008] trunk/SKBasePDFView.m

[hofman--- via Skim-app-commit]

Revision: 16008
          http://sourceforge.net/p/skim-app/code/16008
Author:   hofman
Date:     2026-01-12 17:59:43 +0000 (Mon, 12 Jan 2026)
Log Message:
-----------
no variable for page

Modified Paths:
--------------
    trunk/SKBasePDFView.m

Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m       2026-01-12 17:26:59 UTC (rev 16007)
+++ trunk/SKBasePDFView.m       2026-01-12 17:59:43 UTC (rev 16008)
@@ -317,17 +317,14 @@
         [super goToPreviousPage:sender];
     } else if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection]) {
         PDFDocument *doc = [self document];
-        PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self currentPage]] 
- 1];
-        [self horizontallyGoToPage:page];
+        [self horizontallyGoToPage:[doc pageAtIndex:[doc indexForPage:[self 
currentPage]] - 1]];
     } else {
-        PDFPage *page = nil;
-        NSUInteger i = [[self currentPage] pageIndex];
-        NSUInteger di = (displayMode == kPDFDisplayTwoUpContinuous && (i > 1 
|| [self displaysAsBook] == NO)) ? 2 : 1;
-        if (i >= di)
-            page = [[self document] pageAtIndex:i - di];
+        PDFDocument *doc = [self document];
+        NSInteger i = [doc indexForPage:[self currentPage]];
+        i -= (displayMode == kPDFDisplayTwoUpContinuous && (i > 1 || [self 
displaysAsBook] == NO)) ? 2 : 1;
         [super goToPreviousPage:sender];
-        if (page)
-            [self scrollToPage:page mode:kPDFDisplaySinglePageContinuous];
+        if (i >= 0)
+            [self scrollToPage:[doc pageAtIndex:i] 
mode:kPDFDisplaySinglePageContinuous];
     }
 }
 
@@ -337,19 +334,14 @@
         [super goToNextPage:sender];
     } else if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection]) {
         PDFDocument *doc = [self document];
-        PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self currentPage]] 
+ 1];
-        [self horizontallyGoToPage:page];
+        [self horizontallyGoToPage:[doc pageAtIndex:[doc indexForPage:[self 
currentPage]] + 1]];
     } else {
-        PDFPage *page = nil;
-        NSUInteger i = [[self currentPage] pageIndex];
-        NSUInteger di = (displayMode == kPDFDisplayTwoUpContinuous && (i > 0 
|| [self displaysAsBook] == NO)) ? 2 : 1;
-        if (i + di  < [[self document] pageCount])
-            page = [[self document] pageAtIndex:i + di];
-        else if (di == 2 && i + 1  < [[self document] pageCount])
-            page = [[self document] pageAtIndex:i + 1];
+        PDFDocument *doc = [self document];
+        NSUInteger i = [doc indexForPage:[self currentPage]];
+        i += (displayMode == kPDFDisplayTwoUpContinuous && (i > 0 || [self 
displaysAsBook] == NO) && i + 2 < [doc pageCount]) ? 2 : 1;
         [super goToNextPage:sender];
-        if (page)
-            [self scrollToPage:page mode:kPDFDisplaySinglePageContinuous];
+        if (i  < [doc pageCount])
+            [self scrollToPage:[doc pageAtIndex:i] 
mode:kPDFDisplaySinglePageContinuous];
     }
 }
 
@@ -357,8 +349,7 @@
     PDFDisplayMode displayMode = [self displayMode];
     if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection] && [self canGoToFirstPage]) {
         PDFDocument *doc = [self document];
-        PDFPage *page = [doc pageAtIndex:0];
-        [self horizontallyGoToPage:page];
+        [self horizontallyGoToPage:[doc pageAtIndex:0]];
     } else {
         [super goToFirstPage:sender];
     }
@@ -368,8 +359,7 @@
     PDFDisplayMode displayMode = [self displayMode];
     if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection] && [self canGoToLastPage]) {
         PDFDocument *doc = [self document];
-        PDFPage *page = [doc pageAtIndex:[doc pageCount] - 1];
-        [self horizontallyGoToPage:page];
+        [self horizontallyGoToPage:[doc pageAtIndex:[doc pageCount] - 1]];
     } else {
         [super goToLastPage:sender];
     }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit