Revision: 12947
http://sourceforge.net/p/skim-app/code/12947
Author: hofman
Date: 2022-06-25 17:53:47 +0000 (Sat, 25 Jun 2022)
Log Message:
-----------
Get line index for sync bar and pass it to reading bar
Modified Paths:
--------------
trunk/SKPDFView.m
trunk/SKReadingBar.h
trunk/SKReadingBar.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2022-06-25 17:46:55 UTC (rev 12946)
+++ trunk/SKPDFView.m 2022-06-25 17:53:47 UTC (rev 12947)
@@ -2939,9 +2939,13 @@
BOOL invert = [[NSUserDefaults standardUserDefaults]
boolForKey:SKReadingBarInvertKey];
PDFPage *oldPage = nil;
NSRect oldRect = NSZeroRect;
+ NSInteger line = [page indexOfLineRectAtPoint:point lower:YES];
if ([self hasReadingBar] == NO) {
SKReadingBar *aReadingBar = [[SKReadingBar alloc]
initWithPage:page];
- [aReadingBar goToLineForPoint:point];
+ if (line == -1)
+ [aReadingBar goToNextPage];
+ else
+ [aReadingBar setCurrentLine:MIN([aReadingBar maxLine],
line)];
[self setReadingBar:aReadingBar];
[aReadingBar release];
if (invert)
@@ -2952,7 +2956,10 @@
oldPage = [readingBar page];
oldRect = [readingBar currentBoundsForBox:[self
displayBox]];
[readingBar setPage:page];
- [readingBar goToLineForPoint:point];
+ if (line == -1)
+ [readingBar goToNextPage];
+ else
+ [readingBar setCurrentLine:MIN([readingBar maxLine],
line)];
[self setNeedsDisplayInRect:oldRect ofPage:oldPage];
[self setNeedsDisplayInRect:[readingBar
currentBoundsForBox:[self displayBox]] ofPage:[readingBar page]];
}
Modified: trunk/SKReadingBar.h
===================================================================
--- trunk/SKReadingBar.h 2022-06-25 17:46:55 UTC (rev 12946)
+++ trunk/SKReadingBar.h 2022-06-25 17:53:47 UTC (rev 12947)
@@ -62,7 +62,6 @@
- (BOOL)goToPreviousLine;
- (BOOL)goToNextPage;
- (BOOL)goToPreviousPage;
-- (BOOL)goToLineForPoint:(NSPoint)point;
- (void)drawForPage:(PDFPage *)pdfPage withBox:(PDFDisplayBox)box
inContext:(CGContextRef)context;
- (void)drawForPage:(PDFPage *)pdfPage withBox:(PDFDisplayBox)box
active:(BOOL)active;
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2022-06-25 17:46:55 UTC (rev 12946)
+++ trunk/SKReadingBar.m 2022-06-25 17:53:47 UTC (rev 12947)
@@ -232,17 +232,6 @@
return [self goToPreviousPageAtTop:YES];
}
-- (BOOL)goToLineForPoint:(NSPoint)point {
- if ([lineRects count] == 0) {
- if (currentLine == -1)
- return [self goToNextPageAtTop:YES];
- return NO;
- }
- currentLine = MAX(0, MIN([self maxLine], [page
indexOfLineRectAtPoint:point lower:YES]));
- [self updateCurrentBounds];
- return YES;
-}
-
- (void)drawForPage:(PDFPage *)pdfPage withBox:(PDFDisplayBox)box
inContext:(CGContextRef)context {
BOOL invert = [[NSUserDefaults standardUserDefaults]
boolForKey:SKReadingBarInvertKey];
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
