Revision: 5823
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5823&view=rev
Author:   hofman
Date:     2009-09-28 11:00:02 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
use leopard method to go to a rect on a page

Modified Paths:
--------------
    trunk/SKMainDocument.m
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_Actions.m
    trunk/SKPDFView.h
    trunk/SKPDFView.m

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2009-09-28 10:06:41 UTC (rev 5822)
+++ trunk/SKMainDocument.m      2009-09-28 11:00:02 UTC (rev 5823)
@@ -2110,7 +2110,7 @@
         if ([selection hasCharacters]) {
             PDFPage *page = [selection safeFirstPage];
             NSRect bounds = [selection boundsForPage:page];
-            [[self pdfView] scrollRect:bounds inPageToVisible:page];
+            [[self pdfView] goToRect:bounds onPage:page];
         }
     }
 }

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-09-28 10:06:41 UTC (rev 5822)
+++ trunk/SKMainWindowController.m      2009-09-28 11:00:02 UTC (rev 5823)
@@ -1980,7 +1980,7 @@
     if (scroll && [firstSel hasCharacters]) {
         PDFPage *page = [currentSel safeFirstPage];
         NSRect rect = NSIntersectionRect(NSInsetRect([currentSel 
boundsForPage:page], -50.0, -50.0), [page boundsForBox:kPDFDisplayBoxCropBox]);
-        [pdfView scrollRect:rect inPageToVisible:page];
+        [pdfView goToRect:rect onPage:page];
     }
     
     [self removeTemporaryAnnotations];

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2009-09-28 10:06:41 UTC (rev 
5822)
+++ trunk/SKMainWindowController_Actions.m      2009-09-28 11:00:02 UTC (rev 
5823)
@@ -472,7 +472,7 @@
                 scale = NSWidth(bounds) / NSWidth(selRect);
             [pdfView setScaleFactor:scale];
         }
-        [pdfView scrollRect:selRect inPageToVisible:[pdfView 
currentSelectionPage]]; 
+        [pdfView goToRect:selRect onPage:[pdfView currentSelectionPage]]; 
     } else NSBeep();
 }
 

Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h   2009-09-28 10:06:41 UTC (rev 5822)
+++ trunk/SKPDFView.h   2009-09-28 11:00:02 UTC (rev 5823)
@@ -195,7 +195,6 @@
 - (void)selectPreviousActiveAnnotation:(id)sender;
 
 - (void)scrollAnnotationToVisible:(PDFAnnotation *)annotation;
-- (void)scrollRect:(NSRect)rect inPageToVisible:(PDFPage *)page;
 - (void)scrollPageToVisible:(PDFPage *)page;
 - (void)displayLineAtPoint:(NSPoint)point inPageAtIndex:(NSUInteger)pageIndex 
showReadingBar:(BOOL)showBar;
 

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2009-09-28 10:06:41 UTC (rev 5822)
+++ trunk/SKPDFView.m   2009-09-28 11:00:02 UTC (rev 5823)
@@ -677,7 +677,7 @@
         readingBar = [[SKReadingBar alloc] initWithPage:[self currentPage]];
         [readingBar setNumberOfLines:MAX(1, [[NSUserDefaults 
standardUserDefaults] integerForKey:SKReadingBarNumberOfLinesKey])];
         [readingBar goToNextLine];
-        [self scrollRect:NSInsetRect([readingBar currentBounds], 0.0, -20.0) 
inPageToVisible:[readingBar page]];
+        [self goToRect:NSInsetRect([readingBar currentBounds], 0.0, -20.0) 
onPage:[readingBar page]];
         [userInfo setValue:[readingBar page] forKey:SKPDFViewNewPageKey];
     }
     [self setNeedsDisplay:YES];
@@ -1568,7 +1568,7 @@
     if (range.location != NSNotFound) {
         PDFSelection *selection = [page selectionForRange:range];
         [self setCurrentSelection:selection];
-        [self scrollRect:[selection boundsForPage:page] inPageToVisible:page];
+        [self goToRect:[selection boundsForPage:page] onPage:page];
         [[NSSpellChecker sharedSpellChecker] 
updateSpellingPanelWithMisspelledWord:[selection string]];
     } else NSBeep();
 }
@@ -2238,25 +2238,16 @@
     }
 }
 
-- (void)scrollRect:(NSRect)rect inPageToVisible:(PDFPage *)page {
-    rect = [self convertRect:[self convertRect:rect fromPage:page] 
toView:[self documentView]];
-    if ([[self currentPage] isEqual:page] == NO)
-        [self goToPage:page];
-    [[self documentView] scrollRectToVisible:rect];
-}
-
 - (void)scrollPageToVisible:(PDFPage *)page {
     NSRect ignored, rect = [page boundsForBox:[self displayBox]];
-    rect = [self convertRect:[self convertRect:rect fromPage:page] 
toView:[self documentView]];
     if ([[self currentPage] isEqual:page] == NO)
         [self goToPage:page];
-    [[self documentView] scrollRectToVisible:rect];
-    NSDivideRect(rect, &rect, &ignored, 1.0, NSMaxYEdge);
-    [[self documentView] scrollRectToVisible:rect];
+    NSDivideRect([self convertRect:rect fromPage:page], &rect, &ignored, 1.0, 
NSMaxYEdge);
+    [self goToRect:[self convertRect:rect toPage:page] onPage:page];
 }
 
 - (void)scrollAnnotationToVisible:(PDFAnnotation *)annotation {
-    [self scrollRect:[annotation bounds] inPageToVisible:[annotation page]];
+    [self goToRect:[annotation bounds] onPage:[annotation page]];
 }
 
 - (void)displayLineAtPoint:(NSPoint)point inPageAtIndex:(NSUInteger)pageIndex 
showReadingBar:(BOOL)showBar {
@@ -2279,7 +2270,7 @@
                 [self setCurrentSelection:sel];
             }
         }
-        [self scrollRect:rect inPageToVisible:page];
+        [self goToRect:rect onPage:page];
     }
 }
 
@@ -2944,7 +2935,7 @@
             visibleRect = [self convertRect:visibleRect toPage:[readingBar 
page]];
             rect = NSInsetRect(rect, 0.0, - SKFloor( ( NSHeight(visibleRect) - 
NSHeight(rect) ) / 2.0 ) );
         }
-        [self scrollRect:rect inPageToVisible:[readingBar page]];
+        [self goToRect:rect onPage:[readingBar page]];
         [self setNeedsDisplay:YES];
         [userInfo setObject:[readingBar page] forKey:SKPDFViewNewPageKey];
         [[NSNotificationCenter defaultCenter] 
postNotificationName:SKPDFViewReadingBarDidChangeNotification object:self 
userInfo:userInfo];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to