Signed-off-by: falkTX <falktx@falktx.com>pull/321/merge
@@ -541,7 +541,7 @@ private: | |||||
uint height, | uint height, | ||||
double scaleFactor, | double scaleFactor, | ||||
bool resizable, | bool resizable, | ||||
bool isVST3, | |||||
bool usesSizeRequest, | |||||
bool doPostInit); | bool doPostInit); | ||||
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Window) | DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Window) | ||||
@@ -184,7 +184,7 @@ Window::PrivateData::PrivateData(Application& a, Window* const s, | |||||
Window::PrivateData::PrivateData(Application& a, Window* const s, | Window::PrivateData::PrivateData(Application& a, Window* const s, | ||||
const uintptr_t parentWindowHandle, | const uintptr_t parentWindowHandle, | ||||
const uint width, const uint height, | const uint width, const uint height, | ||||
const double scale, const bool resizable, const bool isVST3) | |||||
const double scale, const bool resizable, const bool usesSizeRequest_) | |||||
: app(a), | : app(a), | ||||
appData(a.pData), | appData(a.pData), | ||||
self(s), | self(s), | ||||
@@ -193,7 +193,7 @@ Window::PrivateData::PrivateData(Application& a, Window* const s, | |||||
isClosed(parentWindowHandle == 0), | isClosed(parentWindowHandle == 0), | ||||
isVisible(parentWindowHandle != 0 && view != nullptr), | isVisible(parentWindowHandle != 0 && view != nullptr), | ||||
isEmbed(parentWindowHandle != 0), | isEmbed(parentWindowHandle != 0), | ||||
usesSizeRequest(isVST3), | |||||
usesSizeRequest(usesSizeRequest_), | |||||
scaleFactor(scale != 0.0 ? scale : getScaleFactorFromParent(view)), | scaleFactor(scale != 0.0 ? scale : getScaleFactorFromParent(view)), | ||||
autoScaling(false), | autoScaling(false), | ||||
autoScaleFactor(1.0), | autoScaleFactor(1.0), | ||||
@@ -38,10 +38,10 @@ | |||||
# define DISTRHO_UI_IS_STANDALONE 0 | # define DISTRHO_UI_IS_STANDALONE 0 | ||||
#endif | #endif | ||||
#ifdef DISTRHO_PLUGIN_TARGET_VST3 | |||||
# define DISTRHO_UI_IS_VST3 1 | |||||
#if defined(DISTRHO_PLUGIN_TARGET_VST3) || defined(DISTRHO_PLUGIN_TARGET_CLAP) | |||||
# define DISTRHO_UI_USES_SIZE_REQUEST true | |||||
#else | #else | ||||
# define DISTRHO_UI_IS_VST3 0 | |||||
# define DISTRHO_UI_USES_SIZE_REQUEST false | |||||
#endif | #endif | ||||
#ifdef DISTRHO_PLUGIN_TARGET_VST2 | #ifdef DISTRHO_PLUGIN_TARGET_VST2 | ||||
@@ -183,7 +183,7 @@ public: | |||||
const uint height, | const uint height, | ||||
const double scaleFactor) | const double scaleFactor) | ||||
: Window(app, parentWindowHandle, width, height, scaleFactor, | : Window(app, parentWindowHandle, width, height, scaleFactor, | ||||
DISTRHO_UI_USER_RESIZABLE, DISTRHO_UI_IS_VST3, false), | |||||
DISTRHO_UI_USER_RESIZABLE, DISTRHO_UI_USES_SIZE_REQUEST, false), | |||||
ui(uiPtr), | ui(uiPtr), | ||||
initializing(true), | initializing(true), | ||||
receivedReshapeDuringInit(false) | receivedReshapeDuringInit(false) | ||||