VST3 Client: Avoid returning real editor size until onSize has been c…

…alled
juce-framework · Oct 19, 2023 · 3edb072 · 3edb072
1 parent 384ddee
commit 3edb072
Showing 1 changed file with 31 additions and 27 deletions.
diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp
@@ -1844,6 +1844,7 @@ class JuceVST3EditController final : public Vst::EditController,
                #endif
 
                 component = nullptr;
+                lastReportedSize.reset();
             }
 
            #if JUCE_LINUX || JUCE_BSD
@@ -1855,32 +1856,33 @@ class JuceVST3EditController final : public Vst::EditController,
 
         tresult PLUGIN_API onSize (ViewRect* newSize) override
         {
-            if (newSize != nullptr)
+            if (newSize == nullptr)
             {
-                rect = convertFromHostBounds (*newSize);
+                jassertfalse;
+                return kResultFalse;
+            }
 
-                if (component != nullptr)
-                {
-                    component->setSize (rect.getWidth(), rect.getHeight());
-
-                   #if JUCE_MAC
-                    if (cubase10Workaround != nullptr)
-                    {
-                        cubase10Workaround->triggerAsyncUpdate();
-                    }
-                    else
-                   #endif
-                    {
-                        if (auto* peer = component->getPeer())
-                            peer->updateBounds();
-                    }
-                }
+            lastReportedSize.reset();
+            rect = convertFromHostBounds (*newSize);
 
+            if (component == nullptr)
                 return kResultTrue;
+
+            component->setSize (rect.getWidth(), rect.getHeight());
+
+           #if JUCE_MAC
+            if (cubase10Workaround != nullptr)
+            {
+                cubase10Workaround->triggerAsyncUpdate();
+            }
+            else
+           #endif
+            {
+                if (auto* peer = component->getPeer())
+                    peer->updateBounds();
             }
 
-            jassertfalse;
-            return kResultFalse;
+            return kResultTrue;
         }
 
         tresult PLUGIN_API getSize (ViewRect* size) override
@@ -1890,15 +1892,16 @@ class JuceVST3EditController final : public Vst::EditController,
                 return kResultFalse;
            #endif
 
-            if (size != nullptr && component != nullptr)
-            {
-                auto editorBounds = component->getSizeToContainChild();
+            if (size == nullptr || component == nullptr)
+                return kResultFalse;
 
-                *size = convertToHostBounds ({ 0, 0, editorBounds.getWidth(), editorBounds.getHeight() });
-                return kResultTrue;
-            }
+            const auto editorBounds = component->getSizeToContainChild();
+            const auto sizeToReport = lastReportedSize.has_value()
+                                    ? *lastReportedSize
+                                    : convertToHostBounds ({ 0, 0, editorBounds.getWidth(), editorBounds.getHeight() });
 
-            return kResultFalse;
+            lastReportedSize = *size = sizeToReport;
+            return kResultTrue;
         }
 
         tresult PLUGIN_API canResize() override
@@ -2275,6 +2278,7 @@ class JuceVST3EditController final : public Vst::EditController,
 
         //==============================================================================
         ScopedJuceInitialiser_GUI libraryInitialiser;
+        std::optional<ViewRect> lastReportedSize;
 
        #if JUCE_LINUX || JUCE_BSD
         SharedResourcePointer<detail::MessageThread> messageThread;