Define Viewport::Redraw to break more dependency on ProjectWindow.h

src/AudacityApp.cpp

@@ -101,6 +101,7 @@ It handles initialization and termination by subclassing wxApp.
 #include "Track.h"
 #include "prefs/PrefsDialog.h"
 #include "Theme.h"
+#include "Viewport.h"
 #include "PlatformCompatibility.h"
 #include "AutoRecoveryDialog.h"
 #include "SplashDialog.h"
@@ -1196,8 +1197,7 @@ bool AudacityApp::OnExceptionInMainLoop()
 
             // Forget pending changes in the TrackList
             TrackList::Get( *pProject ).ClearPendingTracks();
-
-            ProjectWindow::Get( *pProject ).RedrawProject();
+            Viewport::Get(*pProject).Redraw();
          }
 
          // Give the user an alert

src/LabelDialog.cpp

@@ -29,9 +29,9 @@
 #include "LabelTrack.h"
 #include "Prefs.h"
 #include "Project.h"
-#include "ProjectWindow.h"
 #include "SelectFile.h"
 #include "ViewInfo.h"
+#include "Viewport.h"
 #include "tracks/labeltrack/ui/LabelTrackView.h"
 #include "AudacityMessageBox.h"
 #include "AudacityTextEntryDialog.h"
@@ -749,7 +749,7 @@ void LabelDialog::OnSelectCell(wxGridEvent &event)
       RowData &rd = mData[event.GetRow()];
       mViewInfo->selectedRegion = rd.selectedRegion;
 
-      ProjectWindow::Get( mProject ).RedrawProject();
+      Viewport::Get(mProject).Redraw();
    }
 
    event.Skip();

src/MixerBoard.cpp

@@ -49,6 +49,7 @@
 #include "TrackPanel.h"
 #include "TrackUtilities.h"
 #include "UndoManager.h"
+#include "Viewport.h"
 #include "WaveTrack.h"
 
 #include "widgets/AButton.h"
@@ -793,7 +794,7 @@ void MixerTrackCluster::OnButton_Mute(wxCommandEvent& WXUNUSED(event))
 
    // Update the TrackPanel correspondingly.
    if (TracksBehaviorsSolo.ReadEnum() == SoloBehaviorSimple)
-      ProjectWindow::Get( *mProject ).RedrawProject();
+      Viewport::Get(*mProject).Redraw();
    else
       // Update only the changed track.
       TrackPanel::Get( *mProject ).RefreshTrack(mTrack.get());
@@ -808,7 +809,7 @@ void MixerTrackCluster::OnButton_Solo(wxCommandEvent& WXUNUSED(event))
 
    // Update the TrackPanel correspondingly.
    // Bug 509: Must repaint all, as many tracks can change with one Solo change.
-   ProjectWindow::Get( *mProject ).RedrawProject();
+   Viewport::Get(*mProject).Redraw();
 }
 
 

src/ProjectManager.cpp

@@ -26,15 +26,16 @@ Paul Licameli split from AudacityProject.cpp
 #include "ProjectFileManager.h"
 #include "ProjectHistory.h"
 #include "ProjectSelectionManager.h"
-#include "ProjectWindows.h"
 #include "ProjectRate.h"
 #include "ProjectSettings.h"
 #include "ProjectStatus.h"
 #include "ProjectWindow.h"
+#include "ProjectWindows.h"
 #include "SelectUtilities.h"
 #include "TrackPanel.h"
 #include "TrackUtilities.h"
 #include "UndoManager.h"
+#include "Viewport.h"
 #include "WaveTrack.h"
 #include "wxFileNameWrapper.h"
 #include "Import.h"
@@ -416,6 +417,7 @@ void ProjectManager::OnCloseWindow(wxCloseEvent & event)
    const auto &settings = ProjectSettings::Get( project );
    auto &projectAudioIO = ProjectAudioIO::Get( project );
    auto &tracks = TrackList::Get( project );
+   auto &viewport = Viewport::Get(project);
    auto &window = ProjectWindow::Get( project );
    auto gAudioIO = AudioIO::Get();
 
@@ -450,7 +452,7 @@ void ProjectManager::OnCloseWindow(wxCloseEvent & event)
       ProjectAudioManager::Get( project ).Stop();
 
       projectAudioIO.SetAudioIOToken(0);
-      window.RedrawProject();
+      viewport.Redraw();
    }
    else if (gAudioIO->IsMonitoring()) {
       gAudioIO->StopStream();

src/ProjectWindow.cpp

@@ -660,29 +660,6 @@ void ProjectWindow::ApplyUpdatedTheme()
    ClearBackground();// For wxGTK.
 }
 
-void ProjectWindow::RedrawProject()
-{
-   auto pThis = wxWeakRef<ProjectWindow>(this);
-   CallAfter( [pThis]{
-
-   if (!pThis)
-      return;
-   if (pThis->IsBeingDeleted())
-      return;
-
-   auto pProject = pThis->FindProject();
-   if (!pProject)
-      return;
-
-   auto &project = *pProject;
-   auto &tracks = TrackList::Get( project );
-   auto &trackPanel = GetProjectPanel( project );
-   Viewport::Get(project).UpdateScrollbarsForTracks();
-   trackPanel.Refresh(false);
-
-   });
-}
-
 void ProjectWindow::OnThemeChange(ThemeChangeMessage message)
 {
    auto pProject = FindProject();

src/ProjectWindow.h

@@ -120,7 +120,6 @@ class AUDACITY_DLL_API ProjectWindow final : public ProjectWindowBase
    void SetNormalizedWindowState(wxRect pSizeAndLocation) {  mNormalizedWindowState = pSizeAndLocation;   }
    wxRect GetNormalizedWindowState() const { return mNormalizedWindowState;   }
 
-   void RedrawProject();
 
    void ApplyUpdatedTheme();
 
@@ -162,7 +161,6 @@ class AUDACITY_DLL_API ProjectWindow final : public ProjectWindowBase
    void RefreshTPTrack(Track* pTrk, bool refreshbacking = true) /* not override */;
 
  private:
-
    void OnThemeChange(struct ThemeChangeMessage);
 
    // PrefsListener implementation

src/Screenshot.cpp

@@ -38,14 +38,14 @@ It forwards the actual work of doing the commands to the ScreenshotCommand.
 #include "prefs/GUISettings.h" // for RTL_WORKAROUND
 #include "Project.h"
 #include "ProjectStatus.h"
-#include "ProjectWindow.h"
 #include "ProjectWindows.h"
 #include "Prefs.h"
 #include "toolbars/ToolManager.h"
 #include "tracks/ui/ChannelView.h"
 #include "HelpSystem.h"
 
 #include "ViewInfo.h"
+#include "Viewport.h"
 #include "WaveTrack.h"
 
 class OldStyleCommandType;
@@ -725,12 +725,13 @@ void ScreenshotBigDialog::OnCaptureSomething(wxCommandEvent &  event)
 
 void ScreenshotBigDialog::TimeZoom(double seconds)
 {
-   auto &viewInfo = ViewInfo::Get( mContext.project );
-   auto &window = ProjectWindow::Get( mContext.project );
+   auto &project = mContext.project;
+   auto &viewInfo = ViewInfo::Get(project);
+   auto &window = GetProjectFrame(project);
    int width, height;
    window.GetClientSize(&width, &height);
    viewInfo.SetZoom((0.75 * width) / seconds);
-   window.RedrawProject();
+   Viewport::Get(project).Redraw();
 }
 
 void ScreenshotBigDialog::OnOneSec(wxCommandEvent & WXUNUSED(event))
@@ -767,27 +768,29 @@ void ScreenshotBigDialog::SizeTracks(int h)
    // If there should be more-than-stereo tracks, this makes
    // each channel as high as for a stereo channel
 
-   auto &tracks = TrackList::Get( mContext.project );
+   auto &project = mContext.project;
+   auto &tracks = TrackList::Get(project);
    for (auto t : tracks.Any<WaveTrack>()) {
       auto channels = t->Channels();
       auto nChannels = channels.size();
       auto height = nChannels == 1 ? 2 * h : h;
       for (auto pChannel : channels)
          ChannelView::Get(*pChannel).SetExpandedHeight(height);
    }
-   ProjectWindow::Get( mContext.project ).RedrawProject();
+   Viewport::Get(project).Redraw();
 }
 
 void ScreenshotBigDialog::OnShortTracks(wxCommandEvent & WXUNUSED(event))
 {
-   for (auto t : TrackList::Get(mContext.project).Any<WaveTrack>()) {
+   auto &project = mContext.project;
+   for (auto t : TrackList::Get(project).Any<WaveTrack>()) {
       for (auto pChannel : t->Channels()) {
          auto &view = ChannelView::Get(*pChannel);
          view.SetExpandedHeight(view.GetMinimizedHeight());
       }
    }
 
-   ProjectWindow::Get( mContext.project ).RedrawProject();
+   Viewport::Get(project).Redraw();
 }
 
 void ScreenshotBigDialog::OnMedTracks(wxCommandEvent & WXUNUSED(event))

src/TrackPanel.cpp

@@ -79,6 +79,7 @@ is time to refresh some aspect of the screen.
 #include "TrackArtist.h"
 #include "TrackPanelAx.h"
 #include "TrackPanelResizerCell.h"
+#include "Viewport.h"
 #include "WaveTrack.h"
 
 #include "FrameStatistics.h"
@@ -414,6 +415,7 @@ void TrackPanel::OnTimer(wxTimerEvent& )
 
    AudacityProject *const p = GetProject();
    auto &window = ProjectWindow::Get( *p );
+   auto &viewport = Viewport::Get(*p);
 
    auto &projectAudioIO = ProjectAudioIO::Get( *p );
    auto gAudioIO = AudioIO::Get();
@@ -433,7 +435,7 @@ void TrackPanel::OnTimer(wxTimerEvent& )
          !gAudioIO->IsAudioTokenActive(projectAudioIO.GetAudioIOToken()))
    {
       projectAudioIO.SetAudioIOToken(0);
-      window.RedrawProject();
+      viewport.Redraw();
    }
    if (mLastDrawnSelectedRegion != mViewInfo->selectedRegion) {
       UpdateSelectionDisplay();

src/commands/CommandDispatch.cpp

@@ -16,10 +16,12 @@
 #include "CommandManager.h"
 #include "PluginManager.h"
 #include "ProjectAudioManager.h"
-#include "ProjectWindow.h"
+#include "ProjectWindows.h"
+#include "Viewport.h"
 #include "../effects/EffectManager.h"
 #include "../effects/EffectUI.h"
 #include <wx/log.h>
+#include <wx/frame.h>
 
 bool CommandDispatch::HandleTextualCommand( CommandManager &commandManager,
    const CommandID & Str,
@@ -57,7 +59,7 @@ bool CommandDispatch::DoAudacityCommand(
    const PluginID & ID, const CommandContext & context, unsigned flags )
 {
    auto &project = context.project;
-   auto &window = ProjectWindow::Get( project );
+   auto &window = GetProjectFrame(project);
    const PluginDescriptor *plug = PluginManager::Get().GetPlugin(ID);
    if (!plug)
       return false;
@@ -88,7 +90,7 @@ bool CommandDispatch::DoAudacityCommand(
       PushState(longDesc, shortDesc);
    }
 */
-   window.RedrawProject();
+   Viewport::Get(project).Redraw();
    return true;
 }
 

src/commands/CommandHandler.cpp

@@ -21,11 +21,11 @@
 
 #include "../ActiveProject.h"
 #include "Project.h"
-#include "../ProjectWindow.h"
 #include "AppCommandEvent.h"
 #include "ScriptCommandRelay.h"
 #include "../commands/CommandContext.h"
 #include "../commands/Command.h"
+#include "Viewport.h"
 
 CommandHandler::CommandHandler()
 {
@@ -51,6 +51,6 @@ void CommandHandler::OnReceiveCommand(AppCommandEvent &event)
       wxUnusedVar(result);
 
       // Redraw the project
-      ProjectWindow::Get( context.project ).RedrawProject();
+      Viewport::Get(context.project).Redraw();
    }
 }

src/effects/EffectUI.cpp

@@ -25,11 +25,13 @@
 #include "ProjectAudioIO.h"
 #include "ProjectHistory.h"
 #include "../ProjectWindowBase.h"
+#include "../ProjectWindows.h"
 #include "TrackFocus.h"
 #include "RealtimeEffectList.h"
 #include "RealtimeEffectManager.h"
 #include "RealtimeEffectState.h"
 #include "Theme.h"
+#include "Viewport.h"
 #include "wxWidgetsWindowPlacement.h"
 
 static PluginID GetID(EffectPlugin &effect)
@@ -1131,7 +1133,6 @@ DialogFactoryResults EffectUI::DialogFactory(wxWindow &parent,
 
 #include "PluginManager.h"
 #include "ProjectRate.h"
-#include "../ProjectWindow.h"
 #include "../SelectUtilities.h"
 #include "WaveTrack.h"
 #include "../commands/CommandManager.h"
@@ -1152,7 +1153,7 @@ DialogFactoryResults EffectUI::DialogFactory(wxWindow &parent,
    auto &selectedRegion = ViewInfo::Get( project ).selectedRegion;
    auto &commandManager = CommandManager::Get( project );
    auto &viewport = Viewport::Get(project);
-   auto &window = ProjectWindow::Get( project );
+   auto &window = GetProjectFrame(project);
 
    const PluginDescriptor *plug = PluginManager::Get().GetPlugin(ID);
 
@@ -1311,8 +1312,8 @@ DialogFactoryResults EffectUI::DialogFactory(wxWindow &parent,
          viewport.ZoomFitHorizontally();
    }
 
-   // PRL:  RedrawProject explicitly because sometimes history push is skipped
-   window.RedrawProject();
+   // PRL:  Redraw explicitly because sometimes history push is skipped
+   viewport.Redraw();
 
    if (focus != nullptr && focus->GetParent()==parent) {
       focus->SetFocus();

src/menus/TransportMenus.cpp

@@ -2,15 +2,13 @@
 #include "../CommonCommandFlags.h"
 #include "DeviceManager.h"
 #include "../LabelTrack.h"
-#include "../Menus.h"
 #include "Prefs.h"
 #include "Project.h"
 #include "ProjectAudioIO.h"
 #include "../ProjectAudioManager.h"
 #include "ProjectHistory.h"
 #include "../ProjectSettings.h"
 #include "../ProjectWindows.h"
-#include "../ProjectWindow.h"
 #include "../SelectUtilities.h"
 #include "../SoundActivatedRecord.h"
 #include "TrackFocus.h"
@@ -21,6 +19,7 @@
 #include "../prefs/TracksPrefs.h"
 #include "WaveTrack.h"
 #include "ViewInfo.h"
+#include "Viewport.h"
 #include "../commands/CommandContext.h"
 #include "../commands/CommandManager.h"
 #include "../toolbars/ControlToolBar.h"
@@ -75,7 +74,6 @@ void DoMoveToLabel(AudacityProject &project, bool next)
    auto &tracks = TrackList::Get( project );
    auto &trackFocus = TrackFocus::Get( project );
    auto &viewport = Viewport::Get(project);
-   auto &window = ProjectWindow::Get( project );
    auto &projectAudioManager = ProjectAudioManager::Get(project);
 
    // Find the number of label tracks, and ptr to last track found
@@ -111,13 +109,13 @@ void DoMoveToLabel(AudacityProject &project, bool next)
          if (ProjectAudioIO::Get( project ).IsAudioActive()) {
             TransportUtilities::DoStopPlaying(project);
             selectedRegion = label->selectedRegion;
-            window.RedrawProject();
+            viewport.Redraw();
             TransportUtilities::DoStartPlaying(project, newDefault);
          }
          else {
             selectedRegion = label->selectedRegion;
             viewport.ScrollIntoView(selectedRegion.t0());
-            window.RedrawProject();
+            viewport.Redraw();
          }
          /* i18n-hint:
             String is replaced by the name of a label,

src/toolbars/ToolsToolBar.cpp

@@ -50,8 +50,8 @@
 #include "ImageManipulation.h"
 #include "Project.h"
 #include "../ProjectSettings.h"
-#include "../ProjectWindow.h"
 #include "../tracks/ui/Scrubbing.h"
+#include "Viewport.h"
 
 #include "../widgets/AButton.h"
 
@@ -228,7 +228,7 @@ void ToolsToolBar::OnToolChanged(wxCommandEvent &evt)
    if (evt.GetInt() != ProjectSettings::ChangedTool)
       return;
    DoToolChanged();
-   ProjectWindow::Get( mProject ).RedrawProject();
+   Viewport::Get(mProject).Redraw();
 }
 
 void ToolsToolBar::DoToolChanged()