Merge pull request audacity#5535 from Paul-Licameli/Break-TrackInfo-c…

…ycle Break track info cycle Break dependency cycle of CommonTrackControls, TrackButtonHandles, TrackInfo
crsib · Nov 17, 2023 · 86a6b6d · 86a6b6d
2 parents c2b63b6 + f6e65d1
commit 86a6b6d
Show file tree

Hide file tree

Showing 68 changed files with 936 additions and 685 deletions.
diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp
@@ -130,6 +130,9 @@ class AdornedRulerPanel::CommonRulerHandle : public UIHandle
       , mChoice( menuChoice )
    {}
 
+   std::shared_ptr<const Channel> FindChannel() const override
+   { return nullptr; }
+
    bool Clicked() const { return mClicked != Button::None; }
 
    static UIHandle::Result NeedChangeHighlight(
@@ -922,6 +925,9 @@ class PlayheadHandle : public UIHandle
       , mX( xx )
    {}
 
+   std::shared_ptr<const Channel> FindChannel() const override
+   { return nullptr; }
+
    static UIHandle::Result NeedChangeHighlight(
       const PlayheadHandle &oldState, const PlayheadHandle &newState)
    {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -811,6 +811,8 @@ list( APPEND SOURCES
       tracks/ui/CommonChannelView.h
       tracks/ui/CommonTrackControls.cpp
       tracks/ui/CommonTrackControls.h
+      tracks/ui/CommonTrackInfo.cpp
+      tracks/ui/CommonTrackInfo.h
       tracks/ui/CommonTrackPanelCell.cpp
       tracks/ui/CommonTrackPanelCell.h
       tracks/ui/EditCursorOverlay.cpp

diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp
@@ -861,6 +861,9 @@ class DefaultRightButtonHandler : public UIHandle {
 
    ~DefaultRightButtonHandler() override;
 
+   std::shared_ptr<const Channel> FindChannel() const override
+   { return nullptr; }
+
    virtual Result Click
       (const TrackPanelMouseEvent &event, AudacityProject *pProject) override
    {

diff --git a/src/EnvelopeEditor.cpp b/src/EnvelopeEditor.cpp
@@ -22,6 +22,7 @@
 #include "TrackArtist.h"
 #include "TrackPanelDrawingContext.h"
 #include "ViewInfo.h"
+#include "tracks/ui/EnvelopeHandle.h"
 
 namespace {
 void DrawPoint(wxDC & dc, const wxRect & r, int x, int y, bool top)
@@ -45,7 +46,7 @@ void EnvelopeEditor::DrawPoints(const Envelope &env,
    bool highlight = false;
 #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING
    auto target = dynamic_cast<EnvelopeHandle*>(context.target.get());
-   highlight = target && target->GetEnvelope() == this;
+   highlight = target && target->GetEnvelope() == &env;
 #endif
    wxPen &pen = highlight ? AColor::uglyPen : AColor::envelopePen;
    dc.SetPen( pen );