From fcc8c3b16704d6c6d6434cc5eb6abdc842749d0b Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Mon, 24 Aug 2015 14:18:57 -0400
Subject: [PATCH] When deciding which overlays to redraw, account for Leland's
 recent OSX change

Conflicts:
	src/TrackPanel.cpp
---
 src/TrackPanel.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 0f71f22f5..8371dc8d7 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -1255,8 +1255,13 @@ void TrackPanel::TimerUpdateIndicator()
 
 std::pair<wxRect, bool> TrackPanel::GetIndicatorRectangle()
 {
+   wxRect rect(mLastIndicatorX, 0, 1, mBacking->GetHeight());
+#if defined(__WXMAC__)
+   rect.Inflate(1, 0);
+#endif
+
    return std::make_pair(
-      wxRect(mLastIndicatorX, 0, 1, mBacking->GetHeight()),
+      rect,
       mLastIndicatorX != mNewIndicatorX
    );
 }
@@ -1371,8 +1376,13 @@ std::pair<wxRect, bool> TrackPanel::GetCursorRectangle()
       mNewCursorX = mViewInfo->TimeToPosition(mCursorTime, GetLeftOffset());
    }
 
+   wxRect rect(mLastCursorX, 0, 1, mBacking->GetHeight());
+#if defined(__WXMAC__)
+   rect.Inflate(1, 0);
+#endif
+
    return std::make_pair(
-      wxRect(mLastCursorX, 0, 1, mBacking->GetHeight()),
+      rect,
       mLastCursorX != mNewCursorX
    );
 }
@@ -7520,11 +7530,16 @@ void TrackPanel::TimerUpdateScrubbing()
 
 std::pair<wxRect, bool> TrackPanel::GetScrubSpeedRectangle()
 {
+   wxRect rect(mLastScrubRect);
+#if defined(__WXMAC__)
+   rect.Inflate(1, 0);
+#endif
+
    const bool outdated =
       (mLastScrubRect != mNextScrubRect) ||
       (!mLastScrubRect.IsEmpty() && !ShouldDrawScrubSpeed());
    return std::make_pair(
-      mLastScrubRect,
+      rect,
       outdated
    );
 }