Revision: 15909
http://sourceforge.net/p/skim-app/code/15909
Author: hofman
Date: 2025-12-23 10:34:21 +0000 (Tue, 23 Dec 2025)
Log Message:
-----------
rename method
Modified Paths:
--------------
trunk/PDFView_SKExtensions.h
trunk/PDFView_SKExtensions.m
trunk/SKBasePDFView.m
trunk/SKMainDocument.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_FullScreen.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
trunk/SKSecondaryPDFView.m
trunk/SKSnapshotWindowController.m
Modified: trunk/PDFView_SKExtensions.h
===================================================================
--- trunk/PDFView_SKExtensions.h 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/PDFView_SKExtensions.h 2025-12-23 10:34:21 UTC (rev 15909)
@@ -70,7 +70,7 @@
- (SKDestination)currentDestination:(BOOL)invalidatePointWhenRotated;
- (void)goToCurrentDestination:(SKDestination)destination;
-- (void)goToCurrentPage:(PDFPage *)page;
+- (void)goAndScrollToPage:(PDFPage *)page;
- (NSRect)layoutBoundsForPage:(PDFPage *)page;
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/PDFView_SKExtensions.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -210,7 +210,7 @@
- (void)goToCurrentDestination:(SKDestination)dest {
PDFPage *page = [[self document] pageAtIndex:dest.pageIndex];
if (NSEqualPoints(dest.point, SKUnspecifiedPoint)) {
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
} else {
PDFDestination *destination = [[PDFDestination alloc]
initWithPage:page atPoint:dest.point];
[self goToDestination:destination];
@@ -226,7 +226,7 @@
}
}
-- (void)goToCurrentPage:(PDFPage *)page {
+- (void)goAndScrollToPage:(PDFPage *)page {
[self goToPage:page];
}
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKBasePDFView.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -357,7 +357,7 @@
}
}
-- (void)goToCurrentPage:(PDFPage *)page {
+- (void)goAndScrollToPage:(PDFPage *)page {
if (hasHorizontalLayout(self)) {
horizontallyGoToPage(self, page);
} else {
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKMainDocument.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -274,7 +274,7 @@
dest.point = NSPointFromString(pointString);
[pdfView goToCurrentDestination:dest];
} else if ((NSInteger)[[pdfView currentPage] pageIndex] != page) {
- [pdfView goToCurrentPage:[[pdfView document] pageAtIndex:page -
1]];
+ [pdfView goAndScrollToPage:[[pdfView document] pageAtIndex:page -
1]];
}
}
if ([searchString length] > 0) {
@@ -2048,7 +2048,7 @@
NSPoint point = [(NSData *)pointData pointValueAsQDPoint];
[[self pdfView] goToDestination:[[PDFDestination alloc]
initWithPage:(PDFPage *)location atPoint:point]];
} else {
- [[self pdfView] goToCurrentPage:(PDFPage *)location];
+ [[self pdfView] goAndScrollToPage:(PDFPage *)location];
}
} else if ([primaryWindowController interactionMode] ==
SKPresentationMode) {
} else if ([location isKindOfClass:[PDFAnnotation class]]) {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKMainWindowController.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -1273,7 +1273,7 @@
}
NSUInteger idx = [pageLabels indexOfObject:label];
if (idx != NSNotFound && [[pdfView currentPage] pageIndex] != idx)
- [pdfView goToCurrentPage:[[pdfView document] pageAtIndex:idx]];
+ [pdfView goAndScrollToPage:[[pdfView document] pageAtIndex:idx]];
}
- (BOOL)validatePageLabel:(id *)value error:(NSError **)error {
@@ -1302,7 +1302,7 @@
if ([self interactionMode] == SKPresentationMode)
return [presentationView setPage:page];
else
- [[self pdfView] goToCurrentPage:page];
+ [[self pdfView] goAndScrollToPage:page];
}
- (SKLeftSidePaneState)leftSidePaneState {
@@ -1995,7 +1995,7 @@
rect = NSUnionRect(rect, [sel boundsForPage:page]);
}
rect = NSIntersectionRect(NSInsetRect(rect, -FIND_RESULT_MARGIN,
-FIND_RESULT_MARGIN), [page boundsForBox:kPDFDisplayBoxCropBox]);
- [pdfView goToCurrentPage:page];
+ [pdfView goAndScrollToPage:page];
[pdfView goToRect:rect onPage:page];
}
@@ -2722,7 +2722,7 @@
[presentationView setPage:[[pdfView document]
pageAtIndex:pageIndex]];
} else {
if ([[pdfView currentPage] pageIndex] != pageIndex)
- [pdfView goToCurrentPage:[[pdfView document]
pageAtIndex:pageIndex]];
+ [pdfView goAndScrollToPage:[[pdfView document]
pageAtIndex:pageIndex]];
}
} else if ([indexes count] == 0) {
mwcFlags.updatingThumbnailSelection = 1;
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2025-12-23 10:31:18 UTC (rev
15908)
+++ trunk/SKMainWindowController_FullScreen.m 2025-12-23 10:34:21 UTC (rev
15909)
@@ -171,7 +171,7 @@
// make sure we can synchronize the page between the
presentationView and the pdfView
if ([pdfView displayMode] != kPDFDisplaySinglePage)
[pdfView setExtendedDisplayMode:kPDFDisplaySinglePage];
- [pdfView goToCurrentPage:page];
+ [pdfView goAndScrollToPage:page];
}
if ([self presentationNotesDocument]) {
PDFDocument *pdfDoc = [[self presentationNotesDocument]
pdfDocument];
@@ -178,7 +178,7 @@
NSInteger offset = [self presentationNotesOffset];
NSUInteger pageIndex = (NSUInteger)MAX(0, MIN((NSInteger)[pdfDoc
pageCount], (NSInteger)[[pdfView currentPage] pageIndex] + offset));
if ([self presentationNotesDocument] == [self document])
- [[[presentationNotesAuxiliary previewController] pdfView]
goToCurrentPage:[pdfDoc pageAtIndex:pageIndex]];
+ [[[presentationNotesAuxiliary previewController] pdfView]
goAndScrollToPage:[pdfDoc pageAtIndex:pageIndex]];
else
[[self presentationNotesDocument] setCurrentPage:[pdfDoc
pageAtIndex:pageIndex]];
}
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKMainWindowController_UI.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -509,7 +509,7 @@
[self hideSideWindow];
} else {
if (row != -1)
- [pdfView goToCurrentPage:[[pdfView document]
pageAtIndex:row]];
+ [pdfView goAndScrollToPage:[[pdfView document]
pageAtIndex:row]];
}
}
} else if ([tv isEqual:rightSideController.snapshotTableView]) {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKPDFView.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -701,7 +701,7 @@
PDFPage *page = [self currentPage];
[super setDisplayMode:mode];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
}
}
@@ -738,7 +738,7 @@
[super setDisplayMode:mode];
[self _setDisplaysHorizontally:horizontal];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
}
}
@@ -759,7 +759,7 @@
PDFPage *page = [self currentPage];
[self _setDisplaysHorizontally:flag];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
}
}
@@ -777,7 +777,7 @@
// on 10.15 this does not relayout the view...
[self layoutDocumentView];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewDisplaysRTLChangedNotification object:self];
}
}
@@ -795,7 +795,7 @@
PDFPage *page = [self currentPage];
[super setDisplayBox:box];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
}
}
@@ -812,7 +812,7 @@
PDFPage *page = [self currentPage];
[super setDisplaysAsBook:asBook];
if (page && [page isEqual:[self currentPage]] == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewDisplaysAsBookChangedNotification object:self];
}
}
@@ -1626,9 +1626,9 @@
}
}
-- (void)goToCurrentPage:(PDFPage *)page {
+- (void)goAndScrollToPage:(PDFPage *)page {
[self setNeedsRewind:NO];
- [super goToCurrentPage:page];
+ [super goAndScrollToPage:page];
}
#pragma mark Event Handling
@@ -2984,7 +2984,7 @@
[self setNeedsRewind:NO];
if (wasPageDisplayed == NO)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
if (showBar) {
if ([self hasReadingBar] == NO || [syncDot shouldHideReadingBar])
@@ -3010,7 +3010,7 @@
if (wasPageDisplayed == NO || NSContainsRect(visibleRect, lineRect) ==
NO) {
if (wasPageDisplayed && [self currentPage] != page)
- [self goToCurrentPage:page];
+ [self goAndScrollToPage:page];
if ([self displayMode] == kPDFDisplaySinglePageContinuous || [self
displayMode] == kPDFDisplayTwoUpContinuous)
rect = NSInsetRect(lineRect, 0.0, - floor( (
NSHeight(visibleRect) - NSHeight(rect) ) / 2.0 ) );
if (NSWidth(rect) > NSWidth(visibleRect)) {
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKSecondaryPDFView.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -348,7 +348,7 @@
}
- (void)pagePopUpAction:(id)sender {
- [self goToCurrentPage:[[self document] pageAtIndex:[sender
indexOfSelectedItem]]];
+ [self goAndScrollToPage:[[self document] pageAtIndex:[sender
indexOfSelectedItem]]];
if (transientControlView)
[self hideControlView];
}
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2025-12-23 10:31:18 UTC (rev 15908)
+++ trunk/SKSnapshotWindowController.m 2025-12-23 10:34:21 UTC (rev 15909)
@@ -319,7 +319,7 @@
}
[[self window] setFrame:NSIntegralRect(frame) display:NO animate:NO];
- [pdfView goToCurrentPage:page];
+ [pdfView goAndScrollToPage:page];
if (autoFits) {
[pdfView setAutoFits:autoFits];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
