A step on the tuning ui (#5093)

1. Tab layout 2. Show the tuning grid 3. start cleaning up the code but still a mess Addresses #4390
surge-synthesizer · Sep 15, 2021 · 9a1f37d · 9a1f37d
1 parent e39fc16
commit 9a1f37d
Show file tree

Hide file tree

Showing 4 changed files with 495 additions and 340 deletions.
diff --git a/src/gui/SurgeGUIEditor.h b/src/gui/SurgeGUIEditor.h
@@ -80,7 +80,7 @@ struct PatchStoreDialog;
 class SurgeGUIEditor : public Surge::GUI::IComponentTagValue::Listener,
                        public SurgeStorage::ErrorListener,
                        public juce::KeyListener,
-                       public Surge::Overlays::TuningEditor::ScaleTextEditedListener
+                       public Surge::Overlays::TuningOverlay::TuningTextEditedListener
 {
   public:
     SurgeGUIEditor(SurgeSynthEditor *juceEditor, SurgeSynthesizer *synth);

diff --git a/src/gui/SurgeGUIEditorOverlays.cpp b/src/gui/SurgeGUIEditorOverlays.cpp
@@ -176,8 +176,11 @@ std::unique_ptr<Surge::Overlays::OverlayComponent> SurgeGUIEditor::createOverlay
         auto py = (getWindowSizeY() - h) / 2;
         auto r = juce::Rectangle<int>(px, py, w, h);
 
-        auto pt = std::make_unique<Surge::Overlays::TuningEditor>(synth->storage.currentScale);
-        pt->addScaleTextEditedListener(this);
+        auto pt = std::make_unique<Surge::Overlays::TuningOverlay>();
+        pt->setStorage(&(this->synth->storage));
+        pt->setSkin(currentSkin, bitmapStore);
+        pt->setTuning(synth->storage.currentTuning);
+        // pt->addScaleTextEditedListener(this);
         pt->setEnclosingParentPosition(juce::Rectangle<int>(px, py, w, h));
         pt->setEnclosingParentTitle("Tuning Editor");
         return pt;