audacia
/
audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug2763: Certain Scriptable commands should push Undo stack... 

... Exhaustive examination convinces me that Set Labels and Set Envelope are
the only two needing this.  (The special problems of Open Project merited a
different bug number 2764.)
This commit is contained in:
Paul Licameli 2021-05-15 19:43:52 -04:00 committed by Paul Licameli
parent b5958ff453
commit ff07130ac4
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/SetEnvelopeCommand.cpp
View File

@ -19,7 +19,10 @@
#include "SetEnvelopeCommand.h"
#include "CommandContext.h"
#include "LoadCommands.h"
#include "../ProjectHistory.h"
#include "../UndoManager.h"
#include "../WaveClip.h"
#include "../WaveTrack.h"
#include "../Envelope.h"
@ -57,7 +60,7 @@ void SetEnvelopeCommand::PopulateOrExchange(ShuttleGui & S)
S.EndMultiColumn();
}
bool SetEnvelopeCommand::ApplyInner( const CommandContext &, Track * t )
bool SetEnvelopeCommand::ApplyInner( const CommandContext &context, Track * t )
{
// if no time is specified, then
// - delete deletes any envelope in selected tracks.
@ -75,10 +78,19 @@ bool SetEnvelopeCommand::ApplyInner( const CommandContext &, Track * t )
{
// Inside this IF is where we actually apply the command
Envelope* pEnv = pClip->GetEnvelope();
bool didSomething = false;
if( bHasDelete && mbDelete )
pEnv->Clear();
pEnv->Clear(), didSomething = true;
if( bHasT && bHasV )
pEnv->InsertOrReplace( mT, pEnv->ClampValue( mV ) );
pEnv->InsertOrReplace( mT, pEnv->ClampValue( mV ) ),
didSomething = true;
if (didSomething)
// Consolidate, because this ApplyInner() function may be
// visited multiple times in one command invocation
ProjectHistory::Get(context.project).PushState(
XO("Edited Envelope"), XO("Envelope"),
UndoPush::CONSOLIDATE);
}
}
} );

5
src/commands/SetLabelCommand.cpp
View File

@ -23,6 +23,7 @@
#include "../ViewInfo.h"
#include "../WaveTrack.h"
#include "../LabelTrack.h"
#include "../ProjectHistory.h"
#include "../Shuttle.h"
#include "../ShuttleGui.h"
#include "CommandContext.h"
@ -123,5 +124,9 @@ bool SetLabelCommand::Apply(const CommandContext & context)
}
labelTrack->SortLabels();
ProjectHistory::Get(context.project).PushState(
XO("Edited Label"), XO("Label"));
return true;
}