Index UI Cleanups (#4882)

1. The LFO display shows the currently selected index in formula 2. MouseWheel works to toggle indexes on mod buttons Closes #4873
surge-synthesizer · Aug 21, 2021 · eda8d9f · eda8d9f
1 parent 8baafdc
commit eda8d9f
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 6 deletions.
diff --git a/src/gui/SurgeGUIEditor.cpp b/src/gui/SurgeGUIEditor.cpp
@@ -4251,6 +4251,10 @@ SurgeGUIEditor::layoutComponentForSkin(std::shared_ptr<Surge::GUI::Skin::Control
             lfoDisplay->setSkin(currentSkin, bitmapStore, skinCtrl);
             lfoDisplay->setTag(p->id + start_paramtags);
             lfoDisplay->setLFOStorage(&synth->storage.getPatch().scene[current_scene].lfo[lfo_id]);
+            std::cout << "Setting ModSource to " << p->ctrlgroup_entry << "/" << modsource_index
+                      << std::endl;
+            lfoDisplay->setModSource((modsources)p->ctrlgroup_entry);
+            lfoDisplay->setModIndex(modsource_index);
             lfoDisplay->setStorage(&synth->storage);
             lfoDisplay->setStepSequencerStorage(
                 &synth->storage.getPatch().stepsequences[current_scene][lfo_id]);

diff --git a/src/gui/SurgeGUIEditorValueCallbacks.cpp b/src/gui/SurgeGUIEditorValueCallbacks.cpp
@@ -2251,8 +2251,10 @@ void SurgeGUIEditor::valueChanged(Surge::GUI::IComponentTagValue *control)
             modsources newsource = cms->getCurrentModSource();
             int newindex = cms->getCurrentModIndex();
 
+            bool updated = false;
             if (cms->getMouseMode() == Surge::Widgets::ModulationSourceButton::CLICK)
             {
+                updated = true;
                 switch (state & 3)
                 {
                 case 0:
@@ -2281,11 +2283,18 @@ void SurgeGUIEditor::valueChanged(Surge::GUI::IComponentTagValue *control)
             }
             else if (cms->getMouseMode() == Surge::Widgets::ModulationSourceButton::HAMBURGER)
             {
+                updated = true;
                 modsource = newsource;
                 modsource_index = newindex;
                 refresh_mod();
             }
 
+            if (updated && lfoDisplay && lfoDisplay->modsource == modsource)
+            {
+                lfoDisplay->setModIndex(modsource_index);
+                lfoDisplay->repaint();
+            }
+
             if (isLFO(newsource))
             {
                 if (modsource_editor[current_scene] != newsource)

diff --git a/src/gui/widgets/LFOAndStepDisplay.cpp b/src/gui/widgets/LFOAndStepDisplay.cpp
@@ -225,20 +225,20 @@ void LFOAndStepDisplay::paintWaveform(juce::Graphics &g, const juce::Rectangle<i
                 susCountdown--;
             }
 
-            val += tlfo->get_output(0);
+            val += tlfo->get_output(modIndex);
             if (tFullWave)
             {
-                auto v = tFullWave->get_output(0);
+                auto v = tFullWave->get_output(modIndex);
                 minwval = std::min(v, minwval);
                 maxwval = std::max(v, maxwval);
                 wval += v;
             }
             if (s == 0)
-                firstval = tlfo->get_output(0);
+                firstval = tlfo->get_output(modIndex);
             if (s == averagingWindow - 1)
-                lastval = tlfo->get_output(0);
-            minval = std::min(tlfo->get_output(0), minval);
-            maxval = std::max(tlfo->get_output(0), maxval);
+                lastval = tlfo->get_output(modIndex);
+            minval = std::min(tlfo->get_output(modIndex), minval);
+            maxval = std::max(tlfo->get_output(modIndex), maxval);
             eval += tlfo->env_val * lfodata->magnitude.get_extended(lfodata->magnitude.val.f);
         }
         val = val / averagingWindow;

diff --git a/src/gui/widgets/LFOAndStepDisplay.h b/src/gui/widgets/LFOAndStepDisplay.h
@@ -73,6 +73,10 @@ struct LFOAndStepDisplay : public juce::Component, public WidgetBaseMixin<LFOAnd
     void setStorage(SurgeStorage *s) { storage = s; }
     LFOStorage *lfodata{nullptr};
     void setLFOStorage(LFOStorage *s) { lfodata = s; }
+    modsources modsource;
+    void setModSource(modsources m) { modsource = m; }
+    int modIndex{0};
+    void setModIndex(int m) { modIndex = m; }
 
     StepSequencerStorage *ss{nullptr};
     void setStepSequencerStorage(StepSequencerStorage *s) { ss = s; }

diff --git a/src/gui/widgets/ModulationSourceButton.cpp b/src/gui/widgets/ModulationSourceButton.cpp
@@ -442,6 +442,23 @@ void ModulationSourceButton::mouseWheelMove(const juce::MouseEvent &event,
         mouseMode = NONE;
         repaint();
     }
+    else if (needsHamburger())
+    {
+        int dir = wheelAccumulationHelper.accumulate(wheel, false, true);
+        if (dir != 0)
+        {
+            auto n = this->modlistIndex - dir;
+            if (n < 0)
+                n = this->modlist.size() - 1;
+            else if (n >= modlist.size())
+                n = 0;
+            this->modlistIndex = n;
+            mouseMode = HAMBURGER;
+            notifyValueChanged();
+            mouseMode = NONE;
+            repaint();
+        }
+    }
 }
 
 void ModulationSourceButton::resized()

diff --git a/src/gui/widgets/ModulationSourceButton.h b/src/gui/widgets/ModulationSourceButton.h
@@ -22,6 +22,7 @@
 #include "juce_gui_basics/juce_gui_basics.h"
 
 #include <string>
+#include "SurgeJUCEHelpers.h"
 
 class SurgeStorage;
 
@@ -161,6 +162,7 @@ struct ModulationSourceButton : public juce::Component,
     void mouseDrag(const juce::MouseEvent &event) override;
     void mouseWheelMove(const juce::MouseEvent &event,
                         const juce::MouseWheelDetails &wheel) override;
+    Surge::GUI::WheelAccumulationHelper wheelAccumulationHelper;
 
     void resized() override;