[Bibdesk-commit] SF.net SVN: bibdesk:[14784] trunk/bibdesk_vendorsrc/amaxwell/FileView/ FVFileView.m

[<ho...@us...>]

Revision: 14784
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=14784&view=rev
Author:   hofman
Date:     2009-03-18 10:10:18 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Update preview actions in fileview to take into account the icon rect

Modified Paths:
--------------
    trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m

Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m	2009-03-18 09:52:25 UTC (rev 14783)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m	2009-03-18 10:10:18 UTC (rev 14784)
@@ -2350,8 +2350,14 @@
         // change selection first, as Finder does
         if ([event clickCount] > 1 && [self _URLAtPoint:p] != nil) {
             if (flags & NSAlternateKeyMask) {
-                [[FVPreviewer sharedPreviewer] setWebViewContextMenuDelegate:[self delegate]];
-                [[FVPreviewer sharedPreviewer] previewURL:[self _URLAtPoint:p] forIconInRect:NSZeroRect];
+                FVPreviewer *previewer = [FVPreviewer sharedPreviewer];
+                [previewer setWebViewContextMenuDelegate:[self delegate]];
+                [self _getGridRow:&r column:&c atPoint:p];
+                NSRect iconRect = [self _rectOfIconInRow:r column:c];
+                iconRect = [self convertRect:iconRect toView:nil];
+                NSPoint origin = [[self window] convertBaseToScreen:iconRect.origin];
+                iconRect.origin = origin;
+                [previewer previewURL:[self _URLAtPoint:p] forIconInRect:iconRect];
             } else {
                 [self openSelectedURLs:self];
             }
@@ -2983,13 +2989,23 @@
 
 - (IBAction)previewAction:(id)sender;
 {
-    if ([_selectionIndexes count] == 1) {
+    FVPreviewer *previewer = [FVPreviewer sharedPreviewer];
+    if ([previewer isPreviewing]) {
+        [previewer stopPreviewing];
+    }
+    else if ([_selectionIndexes count] == 1) {
         [[FVPreviewer sharedPreviewer] setWebViewContextMenuDelegate:[self delegate]];
-        [[FVPreviewer sharedPreviewer] previewURL:[[self _selectedURLs] lastObject] forIconInRect:NSZeroRect];
+        NSUInteger r, c;
+        [self _getGridRow:&r column:&c ofIndex:[_selectionIndexes lastIndex]];
+        NSRect iconRect = [self _rectOfIconInRow:r column:c];
+        iconRect = [self convertRect:iconRect toView:nil];
+        NSPoint origin = [[self window] convertBaseToScreen:iconRect.origin];
+        iconRect.origin = origin;
+        [previewer previewURL:[[self _selectedURLs] lastObject] forIconInRect:iconRect];
     }
     else {
-        [[FVPreviewer sharedPreviewer] setWebViewContextMenuDelegate:nil];
-        [[FVPreviewer sharedPreviewer] previewFileURLs:[self _selectedURLs]];
+        [previewer setWebViewContextMenuDelegate:nil];
+        [previewer previewFileURLs:[self _selectedURLs]];
     }
 }
 


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