Revision: 15907
http://sourceforge.net/p/skim-app/code/15907
Author: hofman
Date: 2025-12-23 10:30:37 +0000 (Tue, 23 Dec 2025)
Log Message:
-----------
make some private scroll method static functions to avoid shadowing
Modified Paths:
--------------
trunk/SKBasePDFView.m
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2025-12-23 10:16:40 UTC (rev 15906)
+++ trunk/SKBasePDFView.m 2025-12-23 10:30:37 UTC (rev 15907)
@@ -226,27 +226,27 @@
return [pdfView displayDirection] == kPDFDisplayDirectionVertical &&
([pdfView displayMode] & kPDFDisplaySinglePageContinuous);
}
-- (void)horizontallyGoToPage:(PDFPage *)page {
- if (page == [self currentPage])
+static void horizontallyGoToPage(PDFView *pdfView, PDFPage *page) {
+ if (page == [pdfView currentPage])
return;
- NSScrollView *scrollView = [self scrollView];
+ NSScrollView *scrollView = [pdfView scrollView];
NSClipView *clipView = [scrollView contentView];
NSRect bounds = [clipView bounds];
NSRect docRect = [[scrollView documentView] frame];
if (NSWidth(docRect) <= NSWidth(bounds))
return;
- NSRect pageBounds = [self convertRect:[self convertRect:[self
layoutBoundsForPage:page] fromPage:page] toView:clipView];
+ NSRect pageBounds = [pdfView convertRect:[pdfView convertRect:[pdfView
layoutBoundsForPage:page] fromPage:page] toView:clipView];
bounds.origin.x = fmin(fmax(fmin(NSMidX(pageBounds) - 0.5 *
NSWidth(bounds), NSMinX(pageBounds)), NSMinX(docRect)), NSMaxX(docRect) -
NSWidth(bounds));
- [self goToPage:page];
+ [pdfView goToPage:page];
[clipView scrollToPoint:bounds.origin];
[scrollView reflectScrolledClipView:clipView];
}
-- (void)verticallyScrollToPage:(PDFPage *)page {
- NSScrollView *scrollView = [self scrollView];
+static void verticallyScrollToPage(PDFView *pdfView, PDFPage *page) {
+ NSScrollView *scrollView = [pdfView scrollView];
CGFloat inset = [scrollView contentInsets].top;
- NSRect pageRect = [self convertRect:[page boundsForBox:[self displayBox]]
fromPage:page];
- CGFloat midY = NSMidY([self bounds]);
+ NSRect pageRect = [pdfView convertRect:[page boundsForBox:[pdfView
displayBox]] fromPage:page];
+ CGFloat midY = NSMidY([pdfView bounds]);
if (NSMinY(pageRect) <= midY - 0.5 * inset && NSMaxY(pageRect) >= midY)
return;
NSClipView *clipView = [scrollView contentView];
@@ -253,10 +253,10 @@
NSRect bounds = [clipView bounds];
NSRect docRect = [[scrollView documentView] frame];
CGFloat margin = 0.0;
- inset = [self convertSize:NSMakeSize(0.0, inset) toView:clipView].height;
- if ([self displaysPageBreaks])
- margin = [self convertSize:NSMakeSize(0.0, [self pageBreakMargins].top
* [self scaleFactor]) toView:clipView].height;
- pageRect = [self convertRect:pageRect toView:clipView];
+ inset = [pdfView convertSize:NSMakeSize(0.0, inset)
toView:clipView].height;
+ if ([pdfView displaysPageBreaks])
+ margin = [pdfView convertSize:NSMakeSize(0.0, [pdfView
pageBreakMargins].top * [pdfView scaleFactor]) toView:clipView].height;
+ pageRect = [pdfView convertRect:pageRect toView:clipView];
if ([clipView isFlipped])
bounds.origin.y = fmin(fmax(fmin(NSMaxY(pageRect) - 0.5 *
(NSHeight(bounds) + inset), NSMinY(pageRect) - margin - inset), NSMinY(docRect)
- inset), NSMaxY(docRect) - NSHeight(bounds));
else
@@ -265,8 +265,8 @@
[scrollView reflectScrolledClipView:clipView];
}
-- (void)verticallyScrollToTop {
- NSScrollView *scrollView = [self scrollView];
+static void verticallyScrollToTop(PDFView *pdfView) {
+ NSScrollView *scrollView = [pdfView scrollView];
NSClipView *clipView = [scrollView contentView];
NSRect bounds = [clipView bounds];
CGFloat inset = [clipView contentInsets].top;
@@ -280,9 +280,8 @@
[clipView scrollToPoint:bounds.origin];
[scrollView reflectScrolledClipView:clipView];
}
-
-- (void)verticallyScrollToBottom {
- NSScrollView *scrollView = [self scrollView];
+static void verticallyScrollToBottom(PDFView *pdfView) {
+ NSScrollView *scrollView = [pdfView scrollView];
NSClipView *clipView = [scrollView contentView];
NSRect bounds = [clipView bounds];
CGFloat inset = [clipView contentInsets].top;
@@ -301,7 +300,7 @@
if (hasHorizontalLayout(self) && [self canGoToPreviousPage]) {
PDFDocument *doc = [self document];
PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self currentPage]]
- 1];
- [self horizontallyGoToPage:page];
+ horizontallyGoToPage(self, page);
} else {
PDFPage *page = nil;
if (hasVerticalLayout(self)) {
@@ -312,7 +311,7 @@
}
[super goToPreviousPage:sender];
if (page)
- [self verticallyScrollToPage:page];
+ verticallyScrollToPage(self, page);
}
}
@@ -320,7 +319,7 @@
if (hasHorizontalLayout(self) && [self canGoToNextPage]) {
PDFDocument *doc = [self document];
PDFPage *page = [doc pageAtIndex:[doc indexForPage:[self currentPage]]
+ 1];
- [self horizontallyGoToPage:page];
+ horizontallyGoToPage(self, page);
} else {
PDFPage *page = nil;
if (hasVerticalLayout(self)) {
@@ -333,7 +332,7 @@
}
[super goToNextPage:sender];
if (page)
- [self verticallyScrollToPage:page];
+ verticallyScrollToPage(self, page);
}
}
@@ -341,7 +340,7 @@
if (hasHorizontalLayout(self) && [self canGoToFirstPage]) {
PDFDocument *doc = [self document];
PDFPage *page = [doc pageAtIndex:0];
- [self horizontallyGoToPage:page];
+ horizontallyGoToPage(self, page);
} else {
[super goToFirstPage:sender];
}
@@ -351,7 +350,7 @@
if (hasHorizontalLayout(self) && [self canGoToLastPage]) {
PDFDocument *doc = [self document];
PDFPage *page = [doc pageAtIndex:[doc pageCount] - 1];
- [self horizontallyGoToPage:page];
+ horizontallyGoToPage(self, page);
} else {
[super goToLastPage:sender];
}
@@ -359,11 +358,11 @@
- (void)goToCurrentPage:(PDFPage *)page {
if (hasHorizontalLayout(self)) {
- [self horizontallyGoToPage:page];
+ horizontallyGoToPage(self, page);
} else {
[self goToPage:page];
if (hasVerticalLayout(self))
- [self verticallyScrollToPage:page];
+ verticallyScrollToPage(self, page);
}
}
@@ -380,7 +379,7 @@
[clipView scrollToPoint:dest.point];
[scrollView reflectScrolledClipView:clipView];
} else if (hasVerticalLayout(self)) {
- [self verticallyScrollToPage:page];
+ verticallyScrollToPage(self, page);
}
}
@@ -450,16 +449,16 @@
// check whether we jumped pages
NSUInteger currentPageIndex = [[self currentPage] pageIndex];
if (currentPageIndex > pageIndex)
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
else if (currentPageIndex < pageIndex)
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
} else if (clipView && NSEqualPoints([clipView bounds].origin,
bounds.origin)) {
if (keyDirection == -1) {
[self goToPreviousPage:sender];
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
} else {
[self goToNextPage:sender];
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
}
}
}
@@ -507,16 +506,16 @@
// check whether we jumped pages
NSUInteger currentPageIndex = [[self currentPage] pageIndex];
if (currentPageIndex < pageIndex)
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
else if (currentPageIndex > pageIndex)
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
} else if (clipView && NSEqualPoints([clipView bounds].origin,
bounds.origin)) {
if (keyDirection == 1) {
[self goToNextPage:sender];
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
} else {
[self goToPreviousPage:sender];
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
}
}
}
@@ -531,9 +530,9 @@
// check whether we jumped pages
NSUInteger currentPageIndex = [[self currentPage] pageIndex];
if (currentPageIndex > pageIndex)
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
else if (currentPageIndex < pageIndex)
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
}
}
@@ -547,9 +546,9 @@
// check whether we jumped pages
NSUInteger currentPageIndex = [[self currentPage] pageIndex];
if (currentPageIndex < pageIndex)
- [self verticallyScrollToBottom];
+ verticallyScrollToBottom(self);
else if (currentPageIndex > pageIndex)
- [self verticallyScrollToTop];
+ verticallyScrollToTop(self);
}
}
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
