From ee88e209e392a4da025802f8061e416609261b10 Mon Sep 17 00:00:00 2001
From: Vitaly Sverchinsky <sverchinsky@gmail.com>
Date: Thu, 15 Jul 2021 14:39:39 +0300
Subject: [PATCH] Track edit cursor drawing moved to track panel

---
 src/TrackPanel.cpp                  | 14 ++++++++++++++
 src/tracks/ui/EditCursorOverlay.cpp | 12 ++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index bd72ec95e..9ebbf4e35 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -1372,6 +1372,20 @@ struct ChannelGroup final : TrackPanelGroup {
 
       return { Axis::Y, std::move( refinement ) };
    }
+
+   void Draw(TrackPanelDrawingContext& context, const wxRect& rect, unsigned iPass) override
+   {
+      if (iPass == TrackArtist::PassFocus && mpTrack->IsSelected())
+      {
+         auto trackRect = wxRect(
+            mLeftOffset, 
+            rect.y, 
+            rect.GetRight() - mLeftOffset, 
+            rect.height);
+         TrackArt::DrawCursor(context, trackRect, mpTrack.get());
+      }
+   }
+
    std::shared_ptr< Track > mpTrack;
    wxCoord mLeftOffset;
 };
diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp
index 1bb058e07..0a0261839 100644
--- a/src/tracks/ui/EditCursorOverlay.cpp
+++ b/src/tracks/ui/EditCursorOverlay.cpp
@@ -99,7 +99,8 @@ void EditCursorOverlay::Draw(OverlayPanel &panel, wxDC &dc)
       return;
 
    auto &trackPanel = TrackPanel::Get( *mProject );
-   if (auto tp = dynamic_cast<TrackPanel*>(&panel)) {
+   //NOTE: point selection cursor drawing over tracks moved to TrackPanel.cpp(see also TrackArt::DrawCursor)
+   /*if (auto tp = dynamic_cast<TrackPanel*>(&panel)) {
       wxASSERT(mIsMaster);
       AColor::CursorColor(&dc);
 
@@ -127,5 +128,12 @@ void EditCursorOverlay::Draw(OverlayPanel &panel, wxDC &dc)
       AColor::Line(dc, mLastCursorX, rect.GetTop(), mLastCursorX, rect.GetBottom());
    }
    else
-      wxASSERT(false);
+      wxASSERT(false);*/
+   if (auto ruler = dynamic_cast<AdornedRulerPanel*>(&panel)) {
+       wxASSERT(!mIsMaster);
+       dc.SetPen(*wxBLACK_PEN);
+       // AColor::Line includes both endpoints so use GetBottom()
+       auto rect = ruler->GetInnerRect();
+       AColor::Line(dc, mLastCursorX, rect.GetTop(), mLastCursorX, rect.GetBottom());
+   }
 }