Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-10 13:40:09 +01:00
Code Issues Releases Wiki Activity

ToolsToolBar.cpp is free from cycles...

Browse Source 
... Use ProjectSettings instead to communicate just an integer to the rest of
the program.
This commit is contained in:
Paul Licameli
2019-06-13 01:53:45 -04:00
parent 4cc35b145b
commit 2f18c624f8
10 changed files with 75 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TrackPanel.cpp
View File

@@ -99,7 +99,6 @@ is time to refresh some aspect of the screen.
#include "ondemand/ODTask.h"
#include "toolbars/ControlToolBar.h"
#include "toolbars/ToolsToolBar.h"
#include "tracks/ui/TrackVRulerControls.h" // for inheritance relation
@@ -1155,10 +1154,13 @@ void TrackPanel::DrawTracks(wxDC * dc)
// Don't draw a bottom margin here.
auto pTtb = &ToolsToolBar::Get( *GetProject() );
bool bMultiToolDown = pTtb->IsDown(multiTool);
bool envelopeFlag = pTtb->IsDown(envelopeTool) || bMultiToolDown;
bool bigPointsFlag = pTtb->IsDown(drawTool) || bMultiToolDown;
const auto &settings = ProjectSettings::Get( *GetProject() );
bool bMultiToolDown =
(ToolCodes::multiTool == settings.GetTool());
bool envelopeFlag =
bMultiToolDown || (ToolCodes::envelopeTool == settings.GetTool());
bool bigPointsFlag =
bMultiToolDown || (ToolCodes::drawTool == settings.GetTool());
bool sliderFlag = bMultiToolDown;
const bool hasSolo = GetTracks()->Any< PlayableTrack >()