Improve SuperMacro display (#368)

- Show a button for number of usages and keep knob enabled
- That button if useage > 0 jumps to the usage

Assisted-By: Claude Opus 4.7

Author: baconpaul

doc/12_roadmap.md

@@ -2,12 +2,6 @@
 
 I have a lot of ideas for a '1.2' version of six sines. Not 2.0. Still compatible. But expanded. Here's my rough list
 
-## SuperMacros
-
-- Make 'used' indicator not disabled but rather a glyph of some form
-- Rather than gray out, switch on in mod matrix when picked
-- 
-
 ## Modulation
 - Clamp targets
 - LFO -> M etc... depth as an additive and attenuation target
@@ -21,7 +15,7 @@ new entry project_tests_harness.md records the Catch2 six-sines-test target, the
 to add new test files to tests/CMakeLists.txt explicitly. Noted your CLAUDE.md edit (line 32 now acknowledges tests).
 
 ## Smaller Things from the crew
-- Reaper analyzer z order screwage (what does surge do)
+- Unison detune - snap at note on or continuous?
 - Now we have DES move MPE to the instance
    - if you load a stream which has it from the clap edge set the instance to that
    - if you load a patch from an sxsnp ignore the patch setting

src/ui/macro-panel.cpp

@@ -49,6 +49,11 @@ MacroPanel::MacroPanel(SixSinesEditor &e) : jcmp::NamedPanel("Macros"), HasEdito
                 editor.macroSubPanel->setEnabledState();
         };
         addAndMakeVisible(*power[i]);
+
+        usageButtons[i] = std::make_unique<jcmp::TextPushButton>();
+        usageButtons[i]->setLabel("0");
+        usageButtons[i]->setOnCallback([this, i]() { showUsageMenu(i); });
+        addAndMakeVisible(*usageButtons[i]);
     }
 
     highlight = std::make_unique<KnobHighlight>(editor);
@@ -64,7 +69,7 @@ void MacroPanel::resized()
     auto y = b.getY();
     for (auto i = 0U; i < numMacros; ++i)
     {
-        positionPowerKnobAndLabel(x, y, power[i], knobs[i], labels[i], true);
+        positionPowerKnobSwitchAndLabel(x, y, power[i], usageButtons[i], knobs[i], labels[i]);
         x += uicPowerKnobWidth + uicMargin;
     }
 }
@@ -92,6 +97,50 @@ void MacroPanel::mouseDown(const juce::MouseEvent &e)
     }
 }
 
+void MacroPanel::refreshUsage(size_t idx)
+{
+    if (idx >= numMacros)
+        return;
+    auto count = editor.macroUsageCache[idx].size();
+    if (usageButtons[idx])
+    {
+        usageButtons[idx]->setLabel(std::to_string(count));
+        usageButtons[idx]->setEnabled(count > 0);
+        usageButtons[idx]->repaint();
+    }
+    if (labels[idx])
+    {
+        labels[idx]->setEnabled(count > 0);
+        labels[idx]->repaint();
+    }
+}
+
+void MacroPanel::showUsageMenu(size_t idx)
+{
+    if (idx >= numMacros)
+        return;
+    auto &uses = editor.macroUsageCache[idx];
+    if (uses.empty())
+        return;
+
+    auto p = juce::PopupMenu();
+    p.addSectionHeader(displayShortName(editor, idx));
+    p.addSeparator();
+    for (auto &u : uses)
+    {
+        auto label = u.nodeLabel + " — " + u.targetName + (u.modulated ? " (mod)" : "");
+        auto refCopy = u;
+        p.addItem(label,
+                  [w = juce::Component::SafePointer(this), refCopy]()
+                  {
+                      if (w && w->editor.macroSubPanel)
+                          w->editor.macroSubPanel->jumpTo(refCopy);
+                  });
+    }
+    p.showMenuAsync(juce::PopupMenu::Options().withParentComponent(&editor),
+                    makeMenuAccessibleButtonCB(usageButtons[idx].get()));
+}
+
 void MacroPanel::refreshLabel(size_t idx)
 {
     if (idx >= numMacros || !labels[idx])

src/ui/macro-panel.h

@@ -19,6 +19,7 @@
 #include <sst/jucegui/components/Knob.h>
 #include <sst/jucegui/components/Label.h>
 #include <sst/jucegui/components/ToggleButton.h>
+#include <sst/jucegui/components/TextPushButton.h>
 #include <sst/jucegui/data/Continuous.h>
 #include "six-sines-editor.h"
 #include "patch-data-bindings.h"
@@ -39,6 +40,14 @@ struct MacroPanel : jcmp::NamedPanel, HasEditor
 
     void refreshLabel(size_t idx);
 
+    // Refresh count button text + enabled state and label enabled state from
+    // editor.macroUsageCache. Called by SixSinesEditor::recomputeMacroUsage.
+    void refreshUsage(size_t idx);
+
+    // Open popup menu listing every consumer of macro idx; each item jumps to
+    // that node via macroSubPanel->jumpTo.
+    void showUsageMenu(size_t idx);
+
     // Single source of truth for macro display names. Short = knob label,
     // Full = sub-panel title. Both fall back to "Macro N" when unrenamed.
     static std::string displayShortName(const SixSinesEditor &editor, size_t idx)
@@ -72,6 +81,8 @@ struct MacroPanel : jcmp::NamedPanel, HasEditor
 
     std::array<std::unique_ptr<jcmp::ToggleButton>, numMacros> power;
     std::array<std::unique_ptr<PatchDiscrete>, numMacros> powerD;
+
+    std::array<std::unique_ptr<jcmp::TextPushButton>, numMacros> usageButtons;
 };
 } // namespace baconpaul::six_sines::ui
 #endif // BACONPAUL_SIX_SINES_UI_MACRO_PANEL_H

src/ui/modulation-components.h

@@ -232,6 +232,15 @@ template <typename Comp, typename Patch> struct ModulationComponents
                     SXSNLOG("GenSet action at " << lidx << " with " << sCopy);
                 if (sCopy == 2048)
                     SXSNLOG("ERROR: GENSET with sCopy=2048 " << lidx);
+                // Selecting a MACRO_MOD_k source while macro k is off auto-powers it.
+                if (sCopy >= ModMatrixConfig::MACRO_MOD_0 &&
+                    sCopy < (int)ModMatrixConfig::MACRO_MOD_0 + (int)numMacros)
+                {
+                    int k = sCopy - (int)ModMatrixConfig::MACRO_MOD_0;
+                    auto &mp = w->editor.patchCopy.macroNodes[k].macroPower;
+                    if (mp.value < 0.5f)
+                        w->editor.setAndSendParamValue(mp, 1.f);
+                }
                 w->editor.setAndSendParamValue(w->patchPtr->modsource[lidx], sCopy);
                 w->resetSourceLabel(lidx);
                 if (w->editor.onModulationRoutingChanged)
@@ -292,19 +301,10 @@ template <typename Comp, typename Patch> struct ModulationComponents
     // (e.g. EXTEND_M only available in PHASE_REMAP).
     std::function<bool(typename Patch::TargetID)> isTargetAvailable{[](auto) { return true; }};
 
-    // Universal source filter: greys MACRO_MOD_k when that macro's power is off.
-    // Panels overriding sourceFilter should fall through to this.
-    SourceFilterResult sharedSourceFilter(int sid)
-    {
-        if (sid >= ModMatrixConfig::MACRO_MOD_0 &&
-            sid < (int)ModMatrixConfig::MACRO_MOD_0 + (int)numMacros)
-        {
-            int k = sid - (int)ModMatrixConfig::MACRO_MOD_0;
-            if (asComp()->editor.patchCopy.macroNodes[k].macroPower.value < 0.5f)
-                return SourceFilterResult::Disabled;
-        }
-        return SourceFilterResult::Include;
-    }
+    // Universal source filter. MACRO_MOD_k is always Include even when macro k
+    // is off; selecting it auto-powers the macro on (see genSet above). Panels
+    // overriding sourceFilter should fall through to this.
+    SourceFilterResult sharedSourceFilter(int /*sid*/) { return SourceFilterResult::Include; }
 
     // Override per-panel to add extra rules; defaults to sharedSourceFilter.
     std::function<SourceFilterResult(int)> sourceFilter{[this](int sid)

src/ui/six-sines-editor.cpp

@@ -1102,11 +1102,7 @@ void SixSinesEditor::recomputeMacroUsage()
     if (macroPanel)
     {
         for (size_t i = 0; i < numMacros; ++i)
-        {
-            auto used = !macroUsageCache[i].empty();
-            if (macroPanel->knobs[i])
-                macroPanel->knobs[i]->setEnabled(used);
-        }
+            macroPanel->refreshUsage(i);
     }
     if (macroSubPanel && macroSubPanel->isVisible())
         macroSubPanel->refreshUsedByList();