From 13db4197b189455a740041dc8ec8081577b9a930 Mon Sep 17 00:00:00 2001 From: EvilDragon Date: Sat, 2 Apr 2022 22:42:34 +0200 Subject: [PATCH] Enable bottom right corner drag resizer in VST2 (#6009) * Enable bottom right corner drag resizer in VST2 --- src/surge-xt/SurgeSynthEditor.cpp | 3 ++- src/surge-xt/SurgeSynthProcessor.cpp | 28 ++++++++++++------------- src/surge-xt/gui/SurgeJUCELookAndFeel.h | 2 ++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/surge-xt/SurgeSynthEditor.cpp b/src/surge-xt/SurgeSynthEditor.cpp index 9b26a84c063..4627d02afec 100644 --- a/src/surge-xt/SurgeSynthEditor.cpp +++ b/src/surge-xt/SurgeSynthEditor.cpp @@ -173,7 +173,8 @@ SurgeSynthEditor::SurgeSynthEditor(SurgeSynthProcessor &p) auto rg = BlockRezoom(this); setSize(BASE_WINDOW_SIZE_X, BASE_WINDOW_SIZE_Y + yExtra); - setResizable(true, false); // For now + // add the bottom right corner resizer only for VST2 + setResizable(true, processor.wrapperType == juce::AudioProcessor::wrapperType_VST); adapter->open(nullptr); diff --git a/src/surge-xt/SurgeSynthProcessor.cpp b/src/surge-xt/SurgeSynthProcessor.cpp index bdd19569e04..ddac1111d56 100644 --- a/src/surge-xt/SurgeSynthProcessor.cpp +++ b/src/surge-xt/SurgeSynthProcessor.cpp @@ -451,33 +451,33 @@ std::string SurgeSynthProcessor::paramClumpName(int clumpid) switch (clumpid) { case 1: - return "Macro Parameters"; + return "Macros"; case 2: - return "Global and FX"; + return "Global & FX"; case 3: - return "Scene A Common"; + return "A Common"; case 4: - return "Scene A Osc"; + return "A Oscillators"; case 5: - return "Scene A Osc Mixer"; + return "A Mixer"; case 6: - return "Scene A Filters"; + return "A Filters"; case 7: - return "Scene A Envelopes"; + return "A Envelopes"; case 8: - return "Scene A LFOs"; + return "A LFOs"; case 9: - return "Scene B Common"; + return "B Common"; case 10: - return "Scene B Osc"; + return "B Oscillators"; case 11: - return "Scene B Osc Mixer"; + return "B Mixer"; case 12: - return "Scene B Filters"; + return "B Filters"; case 13: - return "Scene B Envelopes"; + return "B Envelopes"; case 14: - return "Scene B LFOs"; + return "B LFOs"; } return ""; } diff --git a/src/surge-xt/gui/SurgeJUCELookAndFeel.h b/src/surge-xt/gui/SurgeJUCELookAndFeel.h index aeafcbe3429..29c7b11729f 100644 --- a/src/surge-xt/gui/SurgeJUCELookAndFeel.h +++ b/src/surge-xt/gui/SurgeJUCELookAndFeel.h @@ -48,6 +48,8 @@ class SurgeJUCELookAndFeel : public juce::LookAndFeel_V4, public Surge::GUI::Ski const juce::String &shortcutKeyText, const juce::Drawable *icon, const juce::Colour *const textColourToUse) override; + void drawCornerResizer(juce::Graphics &g, int w, int h, bool, bool) override{}; + enum SurgeColourIds { componentBgStart = 0x3700001,