From ff07130ac4cbc88a67c969caa9a0bbed41af7e17 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sat, 15 May 2021 19:43:52 -0400
Subject: [PATCH] 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.)
---
 src/commands/SetEnvelopeCommand.cpp | 18 +++++++++++++++---
 src/commands/SetLabelCommand.cpp    |  5 +++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp
index e9c56b2f7..031ae5616 100644
--- a/src/commands/SetEnvelopeCommand.cpp
+++ b/src/commands/SetEnvelopeCommand.cpp
@@ -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);
          }
       }
    } );
diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp
index 3623df679..83e227ae0 100644
--- a/src/commands/SetLabelCommand.cpp
+++ b/src/commands/SetLabelCommand.cpp
@@ -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;
 }