From ade331930d1349a2fc5c5b031451ebb41c198f8a Mon Sep 17 00:00:00 2001
From: Paul <baconpaul@users.noreply.github.com>
Date: Wed, 17 Nov 2021 18:01:26 -0500
Subject: [PATCH] Correct a Slider State which interacted with Index (#5423)

Slider Modulatable State didnt' survive modsource index
changes properly. Clean it up to restore working hovers etc

Closes #5380
---
 scripts/pyauto-tests/mod-create.py                  | 10 +++++++++-
 src/surge-xt/gui/SurgeGUIEditor.cpp                 |  7 ++++++-
 src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp   |  3 +--
 src/surge-xt/gui/widgets/ModulationSourceButton.cpp | 10 +++-------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/pyauto-tests/mod-create.py b/scripts/pyauto-tests/mod-create.py
index 89535c7d864..999b8e64a65 100644
--- a/scripts/pyauto-tests/mod-create.py
+++ b/scripts/pyauto-tests/mod-create.py
@@ -10,4 +10,12 @@
 sxttest.loadPatchByPath(sxt, ["Templates", "Init Sine"])
 time.sleep(1)
 
-sxttest.recursiveDump(mf, "")
+mods = sxttest.firstChildByTitle(mf, "Modulators")
+
+sxttest.recursiveDump(mods, "MOD>")
+l1 = sxttest.firstChildByTitle(mods, "LFO 1");
+arm = sxttest.firstChildByTitle(l1, "Select");
+arm.Press()
+arm.Press()
+
+sxttest.recursiveDump(mf, "TOP>");
diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
index 10738a5054f..7d525726e6b 100644
--- a/src/surge-xt/gui/SurgeGUIEditor.cpp
+++ b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -1020,6 +1020,11 @@ void SurgeGUIEditor::refresh_mod()
         {
             auto s = param[i];
 
+            auto p = synth->storage.getPatch().param_ptr[i];
+            if (p)
+            {
+                s->setIsValidToModulate(synth->isValidModulation(p->id, thisms));
+            }
             if (s->getIsValidToModulate())
             {
                 auto use_scene = 0;
@@ -4705,7 +4710,7 @@ SurgeGUIEditor::layoutComponentForSkin(std::shared_ptr<Surge::GUI::Skin::Control
                     break;
 
                 default:
-                    std::cout << tag << std::endl;
+                    std::cout << "Unable to figure out home for tag = " << tag << std::endl;
                     jassert(false);
                     addAndMakeVisibleWithTracking(frame.get(), *hsw);
                     break;
diff --git a/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp b/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
index 4e2709e1df3..a6e07adad58 100644
--- a/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
+++ b/src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp
@@ -744,7 +744,6 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
 
                             auto cb = [this, parameter, use_scene, bvf, thisms, modidx,
                                        clearOp](Surge::Widgets::ModMenuCustomComponent::OpType op) {
-                                std::cout << op << std::endl;
                                 auto ptag = parameter->id;
                                 switch (op)
                                 {
@@ -927,7 +926,7 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
             if (cms->needsHamburger())
             {
                 auto hamSub = juce::PopupMenu();
-                cms->buildHamburgerMenu(hamSub, false);
+                cms->buildHamburgerMenu(hamSub, true);
                 contextMenu.addSubMenu(Surge::GUI::toOSCaseForMenu("Switch To"), hamSub);
                 contextMenu.addSeparator();
             }
diff --git a/src/surge-xt/gui/widgets/ModulationSourceButton.cpp b/src/surge-xt/gui/widgets/ModulationSourceButton.cpp
index 69224742d6d..54341b1afad 100644
--- a/src/surge-xt/gui/widgets/ModulationSourceButton.cpp
+++ b/src/surge-xt/gui/widgets/ModulationSourceButton.cpp
@@ -314,14 +314,10 @@ void ModulationSourceButton::buildHamburgerMenu(juce::PopupMenu &menu,
         {
             auto modName = std::get<3>(e);
 
-            if (this->modlistIndex != idx)
+            if (this->modlistIndex != idx || !addedToModbuttonContextMenu)
             {
-                if (addedToModbuttonContextMenu)
-                {
-                    modName = "Switch to " + modName;
-                }
-
-                menu.addItem(modName, [this, idx]() {
+                bool ticked = !addedToModbuttonContextMenu && this->modlistIndex == idx;
+                menu.addItem(modName, true, ticked, [this, idx]() {
                     this->modlistIndex = idx;
                     mouseMode = HAMBURGER;
                     notifyValueChanged();