Revision: 15744
http://sourceforge.net/p/skim-app/code/15744
Author: hofman
Date: 2025-11-01 18:03:55 +0000 (Sat, 01 Nov 2025)
Log Message:
-----------
use another local variable
Modified Paths:
--------------
trunk/SKBasePDFView.m
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2025-11-01 17:46:01 UTC (rev 15743)
+++ trunk/SKBasePDFView.m 2025-11-01 18:03:55 UTC (rev 15744)
@@ -428,20 +428,21 @@
CGFloat inset = [clipView contentInsets].top;
CGFloat height = NSHeight(bounds) - inset;
CGFloat offset = fmax(height - [scrollView verticalPageScroll], 0.5 *
height);
+ NSRect docRect = [[scrollView documentView] frame];
if (keyDirection == -1) {
// check whether our assumptions are still correct
if ([clipView isFlipped] == NO && NSMinY([clipView bounds]) >
NSMinY(bounds))
- bounds.origin.y = fmin(NSMaxY([[scrollView documentView]
frame]) - height, NSMinY(bounds) + offset);
+ bounds.origin.y = fmin(NSMaxY(docRect) - height,
NSMinY(bounds) + offset);
else if ([clipView isFlipped] && NSMinY([clipView bounds]) <
NSMinY(bounds))
- bounds.origin.y = fmax(NSMinY([[scrollView documentView]
frame]) - inset, NSMinY(bounds) - offset);
+ bounds.origin.y = fmax(NSMinY(docRect) - inset, NSMinY(bounds)
- offset);
else
return;
} else {
// check whether our assumptions are still correct
if ([clipView isFlipped] == NO && NSMinY([clipView bounds]) <
NSMinY(bounds))
- bounds.origin.y = fmax(NSMinY([[scrollView documentView]
frame]), NSMinY(bounds) - offset);
+ bounds.origin.y = fmax(NSMinY(docRect), NSMinY(bounds) -
offset);
else if ([clipView isFlipped] && NSMinY([clipView bounds]) >
NSMinY(bounds))
- bounds.origin.y = fmin(NSMaxY([[scrollView documentView]
frame]) - NSHeight(bounds), NSMinY(bounds) + offset);
+ bounds.origin.y = fmin(NSMaxY(docRect) - NSHeight(bounds),
NSMinY(bounds) + offset);
else
return;
}
@@ -496,10 +497,11 @@
CGFloat inset = [clipView contentInsets].top;
CGFloat height = NSHeight(bounds) - inset;
CGFloat offset = fmax(height - [scrollView verticalPageScroll], 0.5 *
height);
+ NSRect docRect = [[scrollView documentView] frame];
if (keyDirection == 1) {
// check whether our assumptions are still correct
if ([clipView isFlipped] == NO && NSMinY([clipView bounds]) <
NSMinY(bounds))
- bounds.origin.y = fmax(NSMinY([[scrollView documentView]
frame]), NSMinY(bounds) - offset);
+ bounds.origin.y = fmax(NSMinY(docRect), NSMinY(bounds) -
offset);
else if ([clipView isFlipped] && NSMinY([clipView bounds]) >
NSMinY(bounds))
bounds.origin.y = fmin(NSMaxY([[scrollView documentView]
frame]) - NSHeight(bounds), NSMinY(bounds) + offset);
else
@@ -507,9 +509,9 @@
} else {
// check whether our assumptions are still correct
if ([clipView isFlipped] == NO && NSMinY([clipView bounds]) >
NSMinY(bounds))
- bounds.origin.y = fmin(NSMaxY([[scrollView documentView]
frame]) - height, NSMinY(bounds) + offset);
+ bounds.origin.y = fmin(NSMaxY(docRect) - height,
NSMinY(bounds) + offset);
else if ([clipView isFlipped] && NSMinY([clipView bounds]) <
NSMinY(bounds))
- bounds.origin.y = fmax(NSMinY([[scrollView documentView]
frame]) - inset, NSMinY(bounds) - offset);
+ bounds.origin.y = fmax(NSMinY(docRect) - inset, NSMinY(bounds)
- offset);
else
return;
}
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