Revision: 14068
http://sourceforge.net/p/skim-app/code/14068
Author: hofman
Date: 2024-02-27 17:43:14 +0000 (Tue, 27 Feb 2024)
Log Message:
-----------
call reflectScrolledClipView: after calling scrollToPage: to update the
scrollers
Modified Paths:
--------------
trunk/PDFView_SKExtensions.m
trunk/SKBasePDFView.m
trunk/SKPDFView.m
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2024-02-26 18:20:49 UTC (rev 14067)
+++ trunk/PDFView_SKExtensions.m 2024-02-27 17:43:14 UTC (rev 14068)
@@ -254,6 +254,7 @@
if ([clipView isFlipped] == NO)
point.y -= NSHeight([clipView visibleRect]) - [self
convertSize:NSMakeSize(0.0, [scrollView contentInsets].top)
toView:clipView].height;
[clipView scrollToPoint:point];
+ [scrollView reflectScrolledClipView:clipView];
}
}
}
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2024-02-26 18:20:49 UTC (rev 14067)
+++ trunk/SKBasePDFView.m 2024-02-27 17:43:14 UTC (rev 14068)
@@ -183,7 +183,8 @@
- (void)horizontallyGoToPage:(PDFPage *)page {
if (page == [self currentPage])
return;
- NSClipView *clipView = [[self scrollView] contentView];
+ NSScrollView *scrollView = [self scrollView];
+ NSClipView *clipView = [scrollView contentView];
NSRect bounds = [clipView bounds];
NSRect docRect = [[[self scrollView] documentView] frame];
if (NSWidth(docRect) <= NSWidth(bounds))
@@ -192,6 +193,7 @@
bounds.origin.x = fmin(fmax(fmin(NSMidX(pageBounds) - 0.5 *
NSWidth(bounds), NSMinX(pageBounds)), NSMinX(docRect)), NSMaxX(docRect) -
NSWidth(bounds));
[self goToPage:page];
[clipView scrollToPoint:bounds.origin];
+ [scrollView reflectScrolledClipView:clipView];
}
- (void)verticallyScrollToPage:(PDFPage *)page {
@@ -214,6 +216,7 @@
else
bounds.origin.y = fmin(fmax(fmax(NSMaxY(pageRect) + margin -
NSHeight(bounds) + inset, NSMinY(pageRect) - 0.5 * (NSHeight(bounds) - inset)),
NSMinY(docRect)), NSMaxY(docRect) - NSHeight(bounds) + inset);
[clipView scrollToPoint:bounds.origin];
+ [scrollView reflectScrolledClipView:clipView];
}
- (void)goToPreviousPage:(id)sender {
@@ -295,6 +298,7 @@
if ([clipView isFlipped] == NO)
point.y -= NSHeight([clipView visibleRect]) - [self
convertSize:NSMakeSize(0.0, [scrollView contentInsets].top)
toView:clipView].height;
[clipView scrollToPoint:point];
+ [scrollView reflectScrolledClipView:clipView];
} else if (hasVerticalLayout(self)) {
[self verticallyScrollToPage:page];
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2024-02-26 18:20:49 UTC (rev 14067)
+++ trunk/SKPDFView.m 2024-02-27 17:43:14 UTC (rev 14068)
@@ -1121,8 +1121,10 @@
if (NSMinY(docRect) > NSMinY(bounds))
bounds.origin.y = NSMinY(docRect);
}
- if (NSEqualPoints(bounds.origin, currentOrigin) == NO)
+ if (NSEqualPoints(bounds.origin, currentOrigin) == NO) {
[clipView scrollToPoint:bounds.origin];
+ [scrollView reflectScrolledClipView:clipView];
+ }
}
- (void)pacerMoveReadingBar {
@@ -1690,6 +1692,7 @@
bounds.origin.y = fmin(fmax(fmax(NSMaxY(pageRect) -
NSHeight(bounds) + inset, NSMidY(pageRect) - 0.5 * (NSHeight(bounds) - inset)),
NSMinY(docRect)), NSMaxY(docRect) - NSHeight(bounds) + inset);
}
[clipView scrollToPoint:bounds.origin];
+ [scrollView reflectScrolledClipView:clipView];
}
}
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
