Make all plugins auto-scalable and set initial size correctly

48 files changed, 96 insertions, 76 deletions

diff --git a/plugins/ZaMaximX2/DistrhoPluginInfo.h b/plugins/ZaMaximX2/DistrhoPluginInfo.h
index 724a003..604e336 100644
--- a/plugins/ZaMaximX2/DistrhoPluginInfo.h
+++ b/plugins/ZaMaximX2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZaMaximX2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZaMaximX2"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZaMaximX2Artwork::zamaximx2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZaMaximX2Artwork::zamaximx2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZaMaximX2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:LimiterPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Stereo"
diff --git a/plugins/ZaMaximX2/ZaMaximX2UI.cpp b/plugins/ZaMaximX2/ZaMaximX2UI.cpp
index 884fbec..1cb397f 100644
--- a/plugins/ZaMaximX2/ZaMaximX2UI.cpp
+++ b/plugins/ZaMaximX2/ZaMaximX2UI.cpp
@@ -25,10 +25,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZaMaximX2UI::ZaMaximX2UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZaMaximX2Artwork::zamaximx2Width, ZaMaximX2Artwork::zamaximx2Height);
-
     // background
     fImgBackground = Image(ZaMaximX2Artwork::zamaximx2Data, ZaMaximX2Artwork::zamaximx2Width, ZaMaximX2Artwork::zamaximx2Height, kImageFormatBGR);
 
diff --git a/plugins/ZaMaximX2/ZaMaximX2UI.hpp b/plugins/ZaMaximX2/ZaMaximX2UI.hpp
index e2d0add..b47e84f 100644
--- a/plugins/ZaMaximX2/ZaMaximX2UI.hpp
+++ b/plugins/ZaMaximX2/ZaMaximX2UI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZaMaximX2Artwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 
diff --git a/plugins/ZaMultiComp/DistrhoPluginInfo.h b/plugins/ZaMultiComp/DistrhoPluginInfo.h
index 26a1c25..eb5f927 100644
--- a/plugins/ZaMultiComp/DistrhoPluginInfo.h
+++ b/plugins/ZaMultiComp/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZaMultiCompArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZaMultiComp"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS    0
 #define DISTRHO_PLUGIN_IS_RT_SAFE      1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZaMultiCompArtwork::zamulticompWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZaMultiCompArtwork::zamulticompHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZaMultiComp"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:DynamicsPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Mono"
diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.cpp b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
index d45051a..3fd6744 100644
--- a/plugins/ZaMultiComp/ZaMultiCompUI.cpp
+++ b/plugins/ZaMultiComp/ZaMultiCompUI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZaMultiCompUI::ZaMultiCompUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZaMultiCompArtwork::zamulticompWidth, ZaMultiCompArtwork::zamulticompHeight);
-
     // background
     fImgBackground = Image(ZaMultiCompArtwork::zamulticompData, ZaMultiCompArtwork::zamulticompWidth, ZaMultiCompArtwork::zamulticompHeight, kImageFormatBGR);
 
diff --git a/plugins/ZaMultiComp/ZaMultiCompUI.hpp b/plugins/ZaMultiComp/ZaMultiCompUI.hpp
index e0c52e1..2c71013 100644
--- a/plugins/ZaMultiComp/ZaMultiCompUI.hpp
+++ b/plugins/ZaMultiComp/ZaMultiCompUI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZaMultiCompArtwork.hpp"
-
 #define COMPOINTS 1000
 #define MAX_COMP 3
 
diff --git a/plugins/ZaMultiCompX2/DistrhoPluginInfo.h b/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
index 513ef51..29aa818 100644
--- a/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
+++ b/plugins/ZaMultiCompX2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZaMultiCompX2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZaMultiCompX2"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZaMultiCompX2Artwork::zamulticompx2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZaMultiCompX2Artwork::zamulticompx2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZaMultiCompX2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:DynamicsPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Stereo"
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
index 7ed4968..683d556 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZaMultiCompX2UI::ZaMultiCompX2UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZaMultiCompX2Artwork::zamulticompx2Width, ZaMultiCompX2Artwork::zamulticompx2Height);
-
     // background
     fImgBackground = Image(ZaMultiCompX2Artwork::zamulticompx2Data, ZaMultiCompX2Artwork::zamulticompx2Width, ZaMultiCompX2Artwork::zamulticompx2Height, kImageFormatBGR);
 
diff --git a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
index c399c50..9d0a3d4 100644
--- a/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
+++ b/plugins/ZaMultiCompX2/ZaMultiCompX2UI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZaMultiCompX2Artwork.hpp"
-
 #define COMPOINTS 1000
 #define MAX_COMP 3
 
diff --git a/plugins/ZamComp/DistrhoPluginInfo.h b/plugins/ZamComp/DistrhoPluginInfo.h
index 7386bce..182963f 100644
--- a/plugins/ZamComp/DistrhoPluginInfo.h
+++ b/plugins/ZamComp/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamCompArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamComp"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamCompArtwork::zamcompWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamCompArtwork::zamcompHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamComp"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:CompressorPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Mono"
diff --git a/plugins/ZamComp/ZamCompUI.cpp b/plugins/ZamComp/ZamCompUI.cpp
index 1872679..b94cf83 100644
--- a/plugins/ZamComp/ZamCompUI.cpp
+++ b/plugins/ZamComp/ZamCompUI.cpp
@@ -25,10 +25,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamCompUI::ZamCompUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamCompArtwork::zamcompWidth, ZamCompArtwork::zamcompHeight);
-
     // background
     fImgBackground = Image(ZamCompArtwork::zamcompData, ZamCompArtwork::zamcompWidth, ZamCompArtwork::zamcompHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamComp/ZamCompUI.hpp b/plugins/ZamComp/ZamCompUI.hpp
index 57ce971..496d4e3 100644
--- a/plugins/ZamComp/ZamCompUI.hpp
+++ b/plugins/ZamComp/ZamCompUI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamCompArtwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 
diff --git a/plugins/ZamCompX2/DistrhoPluginInfo.h b/plugins/ZamCompX2/DistrhoPluginInfo.h
index 54554fe..177d9e7 100644
--- a/plugins/ZamCompX2/DistrhoPluginInfo.h
+++ b/plugins/ZamCompX2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamCompX2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamCompX2"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamCompX2Artwork::zamcompx2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamCompX2Artwork::zamcompx2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamCompX2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:CompressorPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Stereo"
diff --git a/plugins/ZamCompX2/ZamCompX2UI.cpp b/plugins/ZamCompX2/ZamCompX2UI.cpp
index d0b5f14..f3d96c4 100644
--- a/plugins/ZamCompX2/ZamCompX2UI.cpp
+++ b/plugins/ZamCompX2/ZamCompX2UI.cpp
@@ -25,10 +25,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamCompX2UI::ZamCompX2UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamCompX2Artwork::zamcompx2Width, ZamCompX2Artwork::zamcompx2Height);
-
     // background
     fImgBackground = Image(ZamCompX2Artwork::zamcompx2Data, ZamCompX2Artwork::zamcompx2Width, ZamCompX2Artwork::zamcompx2Height, kImageFormatBGR);
 
diff --git a/plugins/ZamCompX2/ZamCompX2UI.hpp b/plugins/ZamCompX2/ZamCompX2UI.hpp
index 8dced7b..ab0f0a4 100644
--- a/plugins/ZamCompX2/ZamCompX2UI.hpp
+++ b/plugins/ZamCompX2/ZamCompX2UI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamCompX2Artwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 using DGL::ImageSwitch;
diff --git a/plugins/ZamDelay/DistrhoPluginInfo.h b/plugins/ZamDelay/DistrhoPluginInfo.h
index 2b5341a..d08c35f 100644
--- a/plugins/ZamDelay/DistrhoPluginInfo.h
+++ b/plugins/ZamDelay/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamDelayArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamDelay"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  1
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamDelayArtwork::zamdelayWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamDelayArtwork::zamdelayHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamDelay"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:DelayPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Delay|Mono"
diff --git a/plugins/ZamDelay/ZamDelayUI.cpp b/plugins/ZamDelay/ZamDelayUI.cpp
index 0982a86..eb6b1ff 100644
--- a/plugins/ZamDelay/ZamDelayUI.cpp
+++ b/plugins/ZamDelay/ZamDelayUI.cpp
@@ -25,10 +25,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamDelayUI::ZamDelayUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamDelayArtwork::zamdelayWidth, ZamDelayArtwork::zamdelayHeight);
-
     //fNanoText.loadSharedResources();
     //font = fNanoText.findFont(NANOVG_DEJAVU_SANS_TTF);
 
diff --git a/plugins/ZamDelay/ZamDelayUI.hpp b/plugins/ZamDelay/ZamDelayUI.hpp
index 90f22da..7f2d5fc 100644
--- a/plugins/ZamDelay/ZamDelayUI.hpp
+++ b/plugins/ZamDelay/ZamDelayUI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamDelayArtwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 using DGL::ImageSwitch;
diff --git a/plugins/ZamDynamicEQ/DistrhoPluginInfo.h b/plugins/ZamDynamicEQ/DistrhoPluginInfo.h
index 4515502..335f78c 100644
--- a/plugins/ZamDynamicEQ/DistrhoPluginInfo.h
+++ b/plugins/ZamDynamicEQ/DistrhoPluginInfo.h
@@ -16,6 +16,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamDynamicEQArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamDynamicEQ"
 
@@ -31,6 +33,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamDynamicEQArtwork::zamdynamiceqWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamDynamicEQArtwork::zamdynamiceqHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamDynamicEQ"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:EQPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ|Mono"
diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp b/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
index cb9331e..87129d7 100644
--- a/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
+++ b/plugins/ZamDynamicEQ/ZamDynamicEQUI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamDynamicEQUI::ZamDynamicEQUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamDynamicEQArtwork::zamdynamiceqWidth, ZamDynamicEQArtwork::zamdynamiceqHeight);
-
     // background
     fImgBackground = Image(ZamDynamicEQArtwork::zamdynamiceqData, ZamDynamicEQArtwork::zamdynamiceqWidth, ZamDynamicEQArtwork::zamdynamiceqHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp b/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
index 73d4ef6..affe833 100644
--- a/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
+++ b/plugins/ZamDynamicEQ/ZamDynamicEQUI.hpp
@@ -20,8 +20,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamDynamicEQArtwork.hpp"
-
 #define EQPOINTS 575
 #include <complex>
 
diff --git a/plugins/ZamEQ2/DistrhoPluginInfo.h b/plugins/ZamEQ2/DistrhoPluginInfo.h
index 640243d..09690a7 100644
--- a/plugins/ZamEQ2/DistrhoPluginInfo.h
+++ b/plugins/ZamEQ2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamEQ2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamEQ2"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamEQ2Artwork::zameq2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamEQ2Artwork::zameq2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamEQ2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:EQPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ|Mono"
diff --git a/plugins/ZamEQ2/ZamEQ2UI.cpp b/plugins/ZamEQ2/ZamEQ2UI.cpp
index 1b0620c..4e4e386 100644
--- a/plugins/ZamEQ2/ZamEQ2UI.cpp
+++ b/plugins/ZamEQ2/ZamEQ2UI.cpp
@@ -24,10 +24,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamEQ2UI::ZamEQ2UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamEQ2Artwork::zameq2Width, ZamEQ2Artwork::zameq2Height);
-
     // background
     fImgBackground = Image(ZamEQ2Artwork::zameq2Data, ZamEQ2Artwork::zameq2Width, ZamEQ2Artwork::zameq2Height, kImageFormatBGR);
 
diff --git a/plugins/ZamEQ2/ZamEQ2UI.hpp b/plugins/ZamEQ2/ZamEQ2UI.hpp
index c0ea497..03bdcc1 100644
--- a/plugins/ZamEQ2/ZamEQ2UI.hpp
+++ b/plugins/ZamEQ2/ZamEQ2UI.hpp
@@ -22,7 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamEQ2Artwork.hpp"
 #include "ZamEQ2Plugin.hpp"
 
 #define EQPOINTS 1000
diff --git a/plugins/ZamGEQ31/DistrhoPluginInfo.h b/plugins/ZamGEQ31/DistrhoPluginInfo.h
index 60c9f3c..4cd5dd5 100644
--- a/plugins/ZamGEQ31/DistrhoPluginInfo.h
+++ b/plugins/ZamGEQ31/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamGEQ31Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamGEQ31"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamGEQ31Artwork::zamgeq31Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamGEQ31Artwork::zamgeq31Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamGEQ31"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:EQPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ|Mono"
diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.cpp b/plugins/ZamGEQ31/ZamGEQ31UI.cpp
index 77a848c..b08e2f8 100644
--- a/plugins/ZamGEQ31/ZamGEQ31UI.cpp
+++ b/plugins/ZamGEQ31/ZamGEQ31UI.cpp
@@ -22,10 +22,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamGEQ31UI::ZamGEQ31UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamGEQ31Artwork::zamgeq31Width, ZamGEQ31Artwork::zamgeq31Height);
-
     // background
     fImgBackground = Image(ZamGEQ31Artwork::zamgeq31Data, ZamGEQ31Artwork::zamgeq31Width, ZamGEQ31Artwork::zamgeq31Height, kImageFormatBGR);
 
diff --git a/plugins/ZamGEQ31/ZamGEQ31UI.hpp b/plugins/ZamGEQ31/ZamGEQ31UI.hpp
index 2bc3e7a..0fb25f2 100644
--- a/plugins/ZamGEQ31/ZamGEQ31UI.hpp
+++ b/plugins/ZamGEQ31/ZamGEQ31UI.hpp
@@ -22,7 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamGEQ31Artwork.hpp"
 #include "ZamGEQ31Plugin.hpp"
 
 using DGL::Image;
diff --git a/plugins/ZamGate/DistrhoPluginInfo.h b/plugins/ZamGate/DistrhoPluginInfo.h
index 9de2498..60bcae7 100644
--- a/plugins/ZamGate/DistrhoPluginInfo.h
+++ b/plugins/ZamGate/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamGateArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamGate"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamGateArtwork::zamgateWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamGateArtwork::zamgateHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamGate"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:GatePlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Mono"
diff --git a/plugins/ZamGate/ZamGateUI.cpp b/plugins/ZamGate/ZamGateUI.cpp
index 667613f..de692d4 100644
--- a/plugins/ZamGate/ZamGateUI.cpp
+++ b/plugins/ZamGate/ZamGateUI.cpp
@@ -21,10 +21,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamGateUI::ZamGateUI()
-	: UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-	setSize(ZamGateArtwork::zamgateWidth, ZamGateArtwork::zamgateHeight);
-
 	// background
 	fImgBackground = Image(ZamGateArtwork::zamgateData, ZamGateArtwork::zamgateWidth, ZamGateArtwork::zamgateHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamGate/ZamGateUI.hpp b/plugins/ZamGate/ZamGateUI.hpp
index ba2aacb..5b75b1d 100644
--- a/plugins/ZamGate/ZamGateUI.hpp
+++ b/plugins/ZamGate/ZamGateUI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamGateArtwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 using DGL::ImageSwitch;
diff --git a/plugins/ZamGateX2/DistrhoPluginInfo.h b/plugins/ZamGateX2/DistrhoPluginInfo.h
index f19cb75..7d2bc45 100644
--- a/plugins/ZamGateX2/DistrhoPluginInfo.h
+++ b/plugins/ZamGateX2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamGateX2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamGateX2"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamGateX2Artwork::zamgatex2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamGateX2Artwork::zamgatex2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamGateX2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:GatePlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Dynamics|Stereo"
diff --git a/plugins/ZamGateX2/ZamGateX2UI.cpp b/plugins/ZamGateX2/ZamGateX2UI.cpp
index c46eb78..940565f 100644
--- a/plugins/ZamGateX2/ZamGateX2UI.cpp
+++ b/plugins/ZamGateX2/ZamGateX2UI.cpp
@@ -21,10 +21,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamGateX2UI::ZamGateX2UI()
-	: UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-	setSize(ZamGateX2Artwork::zamgatex2Width, ZamGateX2Artwork::zamgatex2Height);
-
 	// background
 	fImgBackground = Image(ZamGateX2Artwork::zamgatex2Data, ZamGateX2Artwork::zamgatex2Width, ZamGateX2Artwork::zamgatex2Height, kImageFormatBGR);
 
diff --git a/plugins/ZamGateX2/ZamGateX2UI.hpp b/plugins/ZamGateX2/ZamGateX2UI.hpp
index 8ecf5ff..403a850 100644
--- a/plugins/ZamGateX2/ZamGateX2UI.hpp
+++ b/plugins/ZamGateX2/ZamGateX2UI.hpp
@@ -21,7 +21,6 @@
 #include "DistrhoUI.hpp"
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
-#include "ZamGateX2Artwork.hpp"
 
 using DGL::Image;
 using DGL::ZamKnob;
diff --git a/plugins/ZamGrains/DistrhoPluginInfo.h b/plugins/ZamGrains/DistrhoPluginInfo.h
index 8e11ba7..db2e26e 100644
--- a/plugins/ZamGrains/DistrhoPluginInfo.h
+++ b/plugins/ZamGrains/DistrhoPluginInfo.h
@@ -16,6 +16,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamGrainsArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamGrains"
 
@@ -31,6 +33,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamGrainsArtwork::zamgrainsWidth
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamGrainsArtwork::zamgrainsHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamGrains"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:DelayPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Delay|Mono"
diff --git a/plugins/ZamGrains/ZamGrainsUI.cpp b/plugins/ZamGrains/ZamGrainsUI.cpp
index 68de7e4..43d3582 100644
--- a/plugins/ZamGrains/ZamGrainsUI.cpp
+++ b/plugins/ZamGrains/ZamGrainsUI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamGrainsUI::ZamGrainsUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamGrainsArtwork::zamgrainsWidth, ZamGrainsArtwork::zamgrainsHeight);
-
     // background
     fImgBackground = Image(ZamGrainsArtwork::zamgrainsData, ZamGrainsArtwork::zamgrainsWidth, ZamGrainsArtwork::zamgrainsHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamGrains/ZamGrainsUI.hpp b/plugins/ZamGrains/ZamGrainsUI.hpp
index 0fee34e..c78294f 100644
--- a/plugins/ZamGrains/ZamGrainsUI.hpp
+++ b/plugins/ZamGrains/ZamGrainsUI.hpp
@@ -20,8 +20,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamGrainsArtwork.hpp"
-
 using DGL::Image;
 using DGL::ImageSwitch;
 using DGL::ZamKnob;
diff --git a/plugins/ZamHeadX2/DistrhoPluginInfo.h b/plugins/ZamHeadX2/DistrhoPluginInfo.h
index 1eaf69c..a5fb549 100644
--- a/plugins/ZamHeadX2/DistrhoPluginInfo.h
+++ b/plugins/ZamHeadX2/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamHeadX2Artwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamHeadX2"
 
@@ -34,6 +36,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS    0
 #define DISTRHO_PLUGIN_IS_RT_SAFE      1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamHeadX2Artwork::zamheadx2Width
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamHeadX2Artwork::zamheadx2Height
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamHeadX2"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:SpatialPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|EQ|Stereo"
diff --git a/plugins/ZamHeadX2/ZamHeadX2UI.cpp b/plugins/ZamHeadX2/ZamHeadX2UI.cpp
index 6cf4fc6..aeee784 100644
--- a/plugins/ZamHeadX2/ZamHeadX2UI.cpp
+++ b/plugins/ZamHeadX2/ZamHeadX2UI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamHeadX2UI::ZamHeadX2UI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamHeadX2Artwork::zamheadx2Width, ZamHeadX2Artwork::zamheadx2Height);
-
     // background
     fImgBackground = Image(ZamHeadX2Artwork::zamheadx2Data, ZamHeadX2Artwork::zamheadx2Width, ZamHeadX2Artwork::zamheadx2Height, kImageFormatBGR);
 
diff --git a/plugins/ZamHeadX2/ZamHeadX2UI.hpp b/plugins/ZamHeadX2/ZamHeadX2UI.hpp
index 8078b61..0ef1332 100644
--- a/plugins/ZamHeadX2/ZamHeadX2UI.hpp
+++ b/plugins/ZamHeadX2/ZamHeadX2UI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamHeadX2Artwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 
diff --git a/plugins/ZamPhono/DistrhoPluginInfo.h b/plugins/ZamPhono/DistrhoPluginInfo.h
index 997734a..ab40a3e 100644
--- a/plugins/ZamPhono/DistrhoPluginInfo.h
+++ b/plugins/ZamPhono/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamPhonoArtwork.hpp"
+
 #define DISTRHO_PLUGIN_NAME "ZamPhono"
 
 #define DISTRHO_PLUGIN_HAS_UI        1
@@ -32,6 +34,9 @@
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 #define DISTRHO_PLUGIN_IS_RT_SAFE    1
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamPhonoArtwork::zamphonoWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamPhonoArtwork::zamphonoHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamPhono"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:UtilityPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Tools|Mono"
diff --git a/plugins/ZamPhono/ZamPhonoUI.cpp b/plugins/ZamPhono/ZamPhonoUI.cpp
index 384311e..23c0bbc 100644
--- a/plugins/ZamPhono/ZamPhonoUI.cpp
+++ b/plugins/ZamPhono/ZamPhonoUI.cpp
@@ -22,10 +22,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamPhonoUI::ZamPhonoUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamPhonoArtwork::zamphonoWidth, ZamPhonoArtwork::zamphonoHeight);
-
     // background
     fImgBackground = Image(ZamPhonoArtwork::zamphonoData, ZamPhonoArtwork::zamphonoWidth, ZamPhonoArtwork::zamphonoHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamPhono/ZamPhonoUI.hpp b/plugins/ZamPhono/ZamPhonoUI.hpp
index 049f669..a6981be 100644
--- a/plugins/ZamPhono/ZamPhonoUI.hpp
+++ b/plugins/ZamPhono/ZamPhonoUI.hpp
@@ -19,7 +19,6 @@
 #include "DistrhoUI.hpp"
 
 #include "ImageWidgets.hpp"
-#include "ZamPhonoArtwork.hpp"
 #include "ZamPhonoPlugin.hpp"
 
 using DGL::Image;
diff --git a/plugins/ZamTube/DistrhoPluginInfo.h b/plugins/ZamTube/DistrhoPluginInfo.h
index d816027..e98e609 100644
--- a/plugins/ZamTube/DistrhoPluginInfo.h
+++ b/plugins/ZamTube/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamTubeArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamTube"
 
@@ -32,6 +34,9 @@
 #define DISTRHO_PLUGIN_WANT_STATE    0
 #define DISTRHO_PLUGIN_WANT_TIMEPOS  0
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamTubeArtwork::zamtubeWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamTubeArtwork::zamtubeHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamTube"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:DistortionPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Distortion|Mono"
diff --git a/plugins/ZamTube/ZamTubeUI.cpp b/plugins/ZamTube/ZamTubeUI.cpp
index 271de71..ef41e9d 100644
--- a/plugins/ZamTube/ZamTubeUI.cpp
+++ b/plugins/ZamTube/ZamTubeUI.cpp
@@ -28,10 +28,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamTubeUI::ZamTubeUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamTubeArtwork::zamtubeWidth, ZamTubeArtwork::zamtubeHeight);
-
     // background
     fImgBackground = Image(ZamTubeArtwork::zamtubeData, ZamTubeArtwork::zamtubeWidth, ZamTubeArtwork::zamtubeHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamTube/ZamTubeUI.hpp b/plugins/ZamTube/ZamTubeUI.hpp
index 7ec11a3..a5fc1a8 100644
--- a/plugins/ZamTube/ZamTubeUI.hpp
+++ b/plugins/ZamTube/ZamTubeUI.hpp
@@ -22,8 +22,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamTubeArtwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 using DGL::ImageSlider;
diff --git a/plugins/ZamVerb/DistrhoPluginInfo.h b/plugins/ZamVerb/DistrhoPluginInfo.h
index eefe766..64a7104 100644
--- a/plugins/ZamVerb/DistrhoPluginInfo.h
+++ b/plugins/ZamVerb/DistrhoPluginInfo.h
@@ -18,6 +18,8 @@
 #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED
 #define DISTRHO_PLUGIN_INFO_H_INCLUDED
 
+#include "ZamVerbArtwork.hpp"
+
 #define DISTRHO_PLUGIN_BRAND "ZamAudio"
 #define DISTRHO_PLUGIN_NAME  "ZamVerb"
 
@@ -33,6 +35,9 @@
 #define DISTRHO_PLUGIN_WANT_FULL_STATE 1
 #define DISTRHO_PLUGIN_WANT_TIMEPOS    0
 
+#define DISTRHO_UI_DEFAULT_WIDTH       ZamVerbArtwork::zamverbWidth
+#define DISTRHO_UI_DEFAULT_HEIGHT      ZamVerbArtwork::zamverbHeight
+
 #define DISTRHO_PLUGIN_URI             "urn:zamaudio:ZamVerb"
 #define DISTRHO_PLUGIN_LV2_CATEGORY    "lv2:ReverbPlugin"
 #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Reverb|Stereo"
diff --git a/plugins/ZamVerb/ZamVerbUI.cpp b/plugins/ZamVerb/ZamVerbUI.cpp
index 1088e62..a5ec755 100644
--- a/plugins/ZamVerb/ZamVerbUI.cpp
+++ b/plugins/ZamVerb/ZamVerbUI.cpp
@@ -23,10 +23,8 @@ START_NAMESPACE_DISTRHO
 // -----------------------------------------------------------------------
 
 ZamVerbUI::ZamVerbUI()
-    : UI()
+    : UI(DISTRHO_UI_DEFAULT_WIDTH, DISTRHO_UI_DEFAULT_HEIGHT, true)
 {
-    setSize(ZamVerbArtwork::zamverbWidth, ZamVerbArtwork::zamverbHeight);
-
     // background
     fImgBackground = Image(ZamVerbArtwork::zamverbData, ZamVerbArtwork::zamverbWidth, ZamVerbArtwork::zamverbHeight, kImageFormatBGR);
 
diff --git a/plugins/ZamVerb/ZamVerbUI.hpp b/plugins/ZamVerb/ZamVerbUI.hpp
index 589e010..ade08b4 100644
--- a/plugins/ZamVerb/ZamVerbUI.hpp
+++ b/plugins/ZamVerb/ZamVerbUI.hpp
@@ -20,8 +20,6 @@
 #include "ImageWidgets.hpp"
 #include "../../widgets/ZamWidgets.hpp"
 
-#include "ZamVerbArtwork.hpp"
-
 using DGL::Image;
 using DGL::ZamKnob;
 using DGL::ImageSlider;