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

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

Revision: 16007
          http://sourceforge.net/p/skim-app/code/16007
Author:   hofman
Date:     2026-01-12 17:26:59 +0000 (Mon, 12 Jan 2026)
Log Message:
-----------
check whether we should scroll first

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

Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m       2026-01-12 17:12:12 UTC (rev 16006)
+++ trunk/SKBasePDFView.m       2026-01-12 17:26:59 UTC (rev 16007)
@@ -313,22 +313,18 @@
 
 - (void)goToPreviousPage:(id)sender {
     PDFDisplayMode displayMode = [self displayMode];
-    if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection]) {
-        if ([self canGoToPreviousPage]) {
-            PDFDocument *doc = [self document];
-            PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self 
currentPage]] - 1];
-            [self horizontallyGoToPage:page];
-        } else {
-            [super goToPreviousPage:sender];
-        }
+    if ((displayMode & kPDFDisplaySinglePageContinuous) == 0 || [self 
canGoToPreviousPage] == NO) {
+        [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];
     } else {
         PDFPage *page = nil;
-        if ((displayMode & kPDFDisplaySinglePageContinuous)) {
-            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];
-        }
+        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];
         [super goToPreviousPage:sender];
         if (page)
             [self scrollToPage:page mode:kPDFDisplaySinglePageContinuous];
@@ -337,24 +333,20 @@
 
 - (void)goToNextPage:(id)sender {
     PDFDisplayMode displayMode = [self displayMode];
-    if (displayMode == kPDFDisplaySinglePageContinuous && [self 
displayDirection]) {
-        if ([self canGoToNextPage]) {
-            PDFDocument *doc = [self document];
-            PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self 
currentPage]] + 1];
-            [self horizontallyGoToPage:page];
-        } else {
-            [super goToNextPage:sender];
-        }
+    if ((displayMode & kPDFDisplaySinglePageContinuous) == 0 || [self 
canGoToNextPage] == NO) {
+        [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];
     } else {
         PDFPage *page = nil;
-        if ((displayMode & kPDFDisplaySinglePageContinuous)) {
-            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];
-        }
+        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];
         [super goToNextPage:sender];
         if (page)
             [self scrollToPage:page mode:kPDFDisplaySinglePageContinuous];

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