Revision: 22904
http://sourceforge.net/p/bibdesk/svn/22904
Author: hofman
Date: 2018-10-31 20:08:54 +0000 (Wed, 31 Oct 2018)
Log Message:
-----------
convert rects to/from screen, as converting points is only defined on 10.12+!
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2018-10-31
19:56:30 UTC (rev 22903)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2018-10-31
20:08:54 UTC (rev 22904)
@@ -3012,7 +3012,7 @@
NSRect sliderRect = tag == _bottomSliderTag ? [self
_bottomSliderRect] : [self _topSliderRect];
sliderRect = [self convertRect:sliderRect toView:nil];
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >=
MAC_OS_X_VERSION_10_7
- sliderRect.origin = [[self window]
convertPointToScreen:sliderRect.origin];
+ sliderRect = [[self window] convertRectToScreen:sliderRect];
#else
sliderRect.origin = [[self window]
convertBaseToScreen:sliderRect.origin];
#endif
@@ -4103,7 +4103,7 @@
if (Nil == QLPreviewPanelClass || [FVPreviewer useQuickLookForURL:aURL] ==
NO) {
iconRect = [self convertRect:iconRect toView:nil];
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >=
MAC_OS_X_VERSION_10_7
- iconRect.origin = [[self window] convertPointToScreen:iconRect.origin];
+ iconRect = [[self window] convertRectToScreen:iconRect];
#else
iconRect.origin = [[self window] convertBaseToScreen:iconRect.origin];
#endif
@@ -4274,7 +4274,7 @@
iconRect = [self _rectOfIconInRow:r column:c];
iconRect = [self convertRect:iconRect toView:nil];
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >=
MAC_OS_X_VERSION_10_7
- iconRect.origin = [[self window] convertPointToScreen:iconRect.origin];
+ iconRect = [[self window] convertRectToScreen:iconRect];
#else
iconRect.origin = [[self window] convertBaseToScreen:iconRect.origin];
#endif
@@ -4338,7 +4338,7 @@
NSUInteger i, r, c;
NSPoint localPoint;
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >=
MAC_OS_X_VERSION_10_7
- localPoint = [self convertPoint:[[self window]
convertPointFromScreen:point] fromView:nil];
+ localPoint = [self convertPoint:[[self window]
convertRectFromScreen:(NSRect){point, NSZeroSize}].origin fromView:nil];
#else
localPoint = [self convertPoint:[[self window] convertScreenToBase:point]
fromView:nil];
#endif
@@ -4369,7 +4369,7 @@
rect = [self _rectOfIconInRow:r column:c];
rect = [self convertRect:rect toView:nil];
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >=
MAC_OS_X_VERSION_10_7
- rect.origin = [[self window] convertPointToScreen:rect.origin];
+ rect = [[self window] convertRectToScreen:rect];
#else
rect.origin = [[self window] convertBaseToScreen:rect.origin];
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
