1
Fork 0

Revert "Alternative way to deal with resizes in jucewrapper"

This reverts commit e4c04c5074.
This commit is contained in:
falkTX 2022-03-20 14:37:10 +00:00
parent f1b66f66f7
commit 5a64561def
1 changed files with 11 additions and 19 deletions

View File

@ -527,7 +527,6 @@ static constexpr const fileRequestFunc nullFileRequestFunc = nullptr;
// UI/editor implementation // UI/editor implementation
class CardinalWrapperEditor : public juce::AudioProcessorEditor, class CardinalWrapperEditor : public juce::AudioProcessorEditor,
private juce::AsyncUpdater,
private juce::Timer private juce::Timer
{ {
CardinalWrapperProcessor& cardinalProcessor; CardinalWrapperProcessor& cardinalProcessor;
@ -557,22 +556,6 @@ public:
} }
protected: protected:
void handleAsyncUpdate() override
{
DISTRHO_SAFE_ASSERT_RETURN(ui != nullptr,);
int width = static_cast<int>(ui->getWidth());
int height = static_cast<int>(ui->getHeight());
#ifdef DISTRHO_OS_MAC
const double scaleFactor = ui->getScaleFactor();
width /= scaleFactor;
height /= scaleFactor;
#endif
setSize(width, height);
}
void timerCallback() override void timerCallback() override
{ {
if (ui == nullptr) if (ui == nullptr)
@ -658,12 +641,21 @@ private:
cardinalProcessor.plugin.setState(key, value); 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<CardinalWrapperEditor*>(ptr); CardinalWrapperEditor* const editor = static_cast<CardinalWrapperEditor*>(ptr);
DISTRHO_SAFE_ASSERT_RETURN(editor != nullptr,); 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<int>(width), static_cast<int>(height));
} }
}; };