Final undo gestures on stack (#6077)

1. Parameter temposync etc 2. Full LFO on LFO menu reset Addresses #694
surge-synthesizer · Apr 23, 2022 · 8f2956b · 8f2956b
1 parent 24bfd69
commit 8f2956b
Show file tree

Hide file tree

Showing 6 changed files with 204 additions and 21 deletions.
diff --git a/src/common/Parameter.h b/src/common/Parameter.h
@@ -471,6 +471,7 @@ class Parameter
     bool affect_other_parameters{};
     float moverate{};
     bool per_voice_processing{};
+    // remember these need to be stashed specially in undo
     bool temposync{}, absolute{}, deactivated{};
 
 #define DEBUG_WRITABLE_EXTEND_RANGE 0

diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -2460,10 +2460,16 @@ void SurgeGUIEditor::setMacroValueFromUndo(int ccid, float val)
 void SurgeGUIEditor::pushParamToUndoRedo(int paramId, Surge::GUI::UndoManager::Target which)
 {
     auto p = synth->storage.getPatch().param_ptr[paramId];
-    auto id = synth->idForParameter(p);
     undoManager()->pushParameterChange(paramId, p, p->val, which);
 }
 
+void SurgeGUIEditor::applyToParamForUndo(int paramId, std::function<void(Parameter *)> f)
+{
+    auto p = synth->storage.getPatch().param_ptr[paramId];
+    f(p);
+    synth->refresh_editor = true;
+}
+
 void SurgeGUIEditor::setModulationFromUndo(int paramId, modsources ms, int scene, int idx,
                                            float val, bool muted)
 {
@@ -2876,6 +2882,7 @@ juce::PopupMenu SurgeGUIEditor::makeLfoMenu(const juce::Point<int> &where)
         for (const auto &p : cat.presets)
         {
             auto action = [this, p, currentLfoId]() {
+                undoManager()->pushFullLFO(current_scene, currentLfoId);
                 this->synth->storage.modulatorPreset->loadPresetFrom(
                     p.path, &(this->synth->storage), current_scene, currentLfoId);
 

diff --git a/src/surge-xt/gui/SurgeGUIEditor.h b/src/surge-xt/gui/SurgeGUIEditor.h
@@ -489,6 +489,7 @@ class SurgeGUIEditor : public Surge::GUI::IComponentTagValue::Listener,
     const std::unique_ptr<Surge::GUI::UndoManager> &undoManager();
     void setParamFromUndo(int paramId, pdata val);
     void pushParamToUndoRedo(int paramId, Surge::GUI::UndoManager::Target which);
+    void applyToParamForUndo(int paramId, std::function<void(Parameter *)> f);
     void setModulationFromUndo(int paramId, modsources ms, int scene, int idx, float val,
                                bool muted);
     void pushModulationToUndoRedo(int paramId, modsources ms, int scene, int idx,

diff --git a/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp b/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
@@ -1744,6 +1744,7 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
                     contextMenu.addItem(
                         Surge::GUI::toOSCase("Reset Filter Cutoff To Keytrack Root"),
                         [this, p, control] {
+                            undoManager()->pushParameterChange(p->id, p, p->val);
                             auto kr = this->synth->storage.getPatch()
                                           .scene[current_scene]
                                           .keytrack_root.val.i;
@@ -1772,35 +1773,52 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
                     bool isChecked = p->porta_constrate;
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Constant Rate"), true, isChecked,
-                                        [this, p]() { p->porta_constrate = !p->porta_constrate; });
+                                        [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_constrate = !p->porta_constrate;
+                                        });
 
                     isChecked = p->porta_gliss;
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Glissando"), true, isChecked,
-                                        [this, p]() { p->porta_gliss = !p->porta_gliss; });
+                                        [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_gliss = !p->porta_gliss;
+                                        });
 
                     isChecked = p->porta_retrigger;
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Retrigger at Scale Degrees"), true,
-                                        isChecked,
-                                        [this, p]() { p->porta_retrigger = !p->porta_retrigger; });
+                                        isChecked, [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_retrigger = !p->porta_retrigger;
+                                        });
 
                     contextMenu.addSectionHeader("CURVE");
 
                     isChecked = (p->porta_curve == -1);
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Logarithmic"), true, isChecked,
-                                        [this, p]() { p->porta_curve = -1; });
+                                        [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_curve = -1;
+                                        });
 
                     isChecked = (p->porta_curve == 0);
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Linear"), true, isChecked,
-                                        [this, p]() { p->porta_curve = 0; });
+                                        [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_curve = 0;
+                                        });
 
                     isChecked = (p->porta_curve == 1);
 
                     contextMenu.addItem(Surge::GUI::toOSCase("Exponential"), true, isChecked,
-                                        [this, p]() { p->porta_curve = 1; });
+                                        [this, p]() {
+                                            undoManager()->pushParameterChange(p->id, p, p->val);
+                                            p->porta_curve = 1;
+                                        });
                 }
 
                 if (p->has_deformoptions())