From 52ca481033e290e4e88d2f4c295287a71e4ad553 Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Thu, 7 Jan 2016 17:21:12 +0000 Subject: [PATCH] #6050: Get rid of calls to deprecated convertScreenToBase: API (patch by mattrajca) --- macosx/FileNameCell.m | 2 +- macosx/FileOutlineView.m | 2 +- macosx/TorrentCell.m | 2 +- macosx/TorrentTableView.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macosx/FileNameCell.m b/macosx/FileNameCell.m index b9e5a68ba..b28dcf251 100644 --- a/macosx/FileNameCell.m +++ b/macosx/FileNameCell.m @@ -149,7 +149,7 @@ NSRect realRect = [self rectForTitleWithString: titleString inBounds: cellFrame]; if ([titleString size].width > NSWidth(realRect) - && NSMouseInRect([view convertPoint: [[view window] convertScreenToBase: [NSEvent mouseLocation]] fromView: nil], realRect, [view isFlipped])) + && NSMouseInRect([view convertPoint: [[view window] mouseLocationOutsideOfEventStream] fromView: nil], realRect, [view isFlipped])) { realRect.size.width = [titleString size].width; return NSInsetRect(realRect, -PADDING_EXPANSION_FRAME, -PADDING_EXPANSION_FRAME); diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m index 8fd84548a..3f866f5cb 100644 --- a/macosx/FileOutlineView.m +++ b/macosx/FileOutlineView.m @@ -96,7 +96,7 @@ if (visibleRows.length == 0) return; - NSPoint mouseLocation = [self convertPoint: [[self window] convertScreenToBase: [NSEvent mouseLocation]] fromView: nil]; + NSPoint mouseLocation = [self convertPoint: [[self window] mouseLocationOutsideOfEventStream] fromView: nil]; for (NSInteger row = visibleRows.location, col = [self columnWithIdentifier: @"Priority"]; row < NSMaxRange(visibleRows); row++) { diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m index 2fd6ed6a1..bef1f45d4 100644 --- a/macosx/TorrentCell.m +++ b/macosx/TorrentCell.m @@ -525,7 +525,7 @@ NSAssert([titleString size].width >= NSWidth(realRect), @"Full rect width should not be less than the used title rect width!"); if ([titleString size].width > NSWidth(realRect) - && NSMouseInRect([view convertPoint: [[view window] convertScreenToBase: [NSEvent mouseLocation]] fromView: nil], realRect, [view isFlipped])) + && NSMouseInRect([view convertPoint: [[view window] mouseLocationOutsideOfEventStream] fromView: nil], realRect, [view isFlipped])) { realRect.size.width = [titleString size].width; return NSInsetRect(realRect, -PADDING_EXPANSION_FRAME, -PADDING_EXPANSION_FRAME); diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m index 770557c0f..e47b34283 100644 --- a/macosx/TorrentTableView.m +++ b/macosx/TorrentTableView.m @@ -234,7 +234,7 @@ if (rows.length == 0) return; - NSPoint mouseLocation = [self convertPoint: [[self window] convertScreenToBase: [NSEvent mouseLocation]] fromView: nil]; + NSPoint mouseLocation = [self convertPoint: [[self window] mouseLocationOutsideOfEventStream] fromView: nil]; for (NSUInteger row = rows.location; row < NSMaxRange(rows); row++) { if (![[self itemAtRow: row] isKindOfClass: [Torrent class]])