From 5a64561def1607a0c5b751d0fcd38b2c7d1e1fea Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 20 Mar 2022 14:37:10 +0000 Subject: [PATCH] Revert "Alternative way to deal with resizes in jucewrapper" This reverts commit e4c04c507468aece305c7f96832aca75d07f941c. --- jucewrapper/CardinalWrapper.cpp | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/jucewrapper/CardinalWrapper.cpp b/jucewrapper/CardinalWrapper.cpp index 7b07525..c4da989 100644 --- a/jucewrapper/CardinalWrapper.cpp +++ b/jucewrapper/CardinalWrapper.cpp @@ -527,7 +527,6 @@ static constexpr const fileRequestFunc nullFileRequestFunc = nullptr; // UI/editor implementation class CardinalWrapperEditor : public juce::AudioProcessorEditor, - private juce::AsyncUpdater, private juce::Timer { CardinalWrapperProcessor& cardinalProcessor; @@ -557,22 +556,6 @@ public: } protected: - void handleAsyncUpdate() override - { - DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,); - - int width = static_cast(ui->getWidth()); - int height = static_cast(ui->getHeight()); - - #ifdef DISTRHO_OS_MAC - const double scaleFactor = ui->getScaleFactor(); - width /= scaleFactor; - height /= scaleFactor; - #endif - - setSize(width, height); - } - void timerCallback() override { if (ui == nullptr) @@ -658,12 +641,21 @@ private: cardinalProcessor.plugin.setState(key, value); } - static void setSizeFunc(void* const ptr, uint, uint) + static void setSizeFunc(void* const ptr, uint width, uint height) { CardinalWrapperEditor* const editor = static_cast(ptr); DISTRHO_SAFE_ASSERT_RETURN(editor != nullptr,); - editor->triggerAsyncUpdate(); + #ifdef DISTRHO_OS_MAC + UIExporter* const ui = editor->ui; + DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,); + + const double scaleFactor = ui->getScaleFactor(); + width /= scaleFactor; + height /= scaleFactor; + #endif + + editor->setSize(static_cast(width), static_cast(height)); } };