Fix parenting of plugin UIs

source/backend/engine/CarlaEngine.cpp

@@ -2153,7 +2153,7 @@ void CarlaEngine::setOption(const EngineOption option, const int value, const ch
 
     case ENGINE_OPTION_FRONTEND_WIN_ID:
         CARLA_SAFE_ASSERT_RETURN(valueStr != nullptr && valueStr[0] != '\0',);
-        const long winId(std::atol(valueStr));
+        const long long winId(std::strtoll(valueStr, nullptr, 16));
         CARLA_SAFE_ASSERT_RETURN(winId >= 0,);
         pData->options.frontendWinId = static_cast<uintptr_t>(winId);
         break;

source/backend/plugin/CarlaPluginUi.cpp

@@ -136,7 +136,9 @@ public:
         XSizeHints sizeHints;
         carla_zeroStruct<XSizeHints>(sizeHints);
 
-        sizeHints.flags      = PMinSize|PMaxSize;
+        sizeHints.flags      = PSize|PMinSize|PMaxSize;
+        sizeHints.width      = static_cast<int>(width);
+        sizeHints.height     = static_cast<int>(height);
         sizeHints.min_width  = static_cast<int>(width);
         sizeHints.min_height = static_cast<int>(height);
         sizeHints.max_width  = static_cast<int>(width);
@@ -160,7 +162,7 @@ public:
         CARLA_SAFE_ASSERT_RETURN(fDisplay != nullptr,);
         CARLA_SAFE_ASSERT_RETURN(fWindow != 0,);
 
-        XSetTransientForHint(fDisplay, fWindow, (Window)winId);
+        XSetTransientForHint(fDisplay, fWindow, static_cast<Window>(winId));
     }
 
     void* getPtr() const noexcept
@@ -190,7 +192,7 @@ bool CarlaPluginUi::tryTransientWinIdMatch(const uintptr_t pid, const char* cons
 #elif defined(HAVE_X11)
     struct ScopedDisplay {
         Display* display;
-        ScopedDisplay() : display(XOpenDisplay(0)) {}
+        ScopedDisplay() : display(XOpenDisplay(nullptr)) {}
         ~ScopedDisplay() { if (display!=nullptr) XCloseDisplay(display); }
     };
     struct ScopedFreeData {

source/backend/plugin/VstPlugin.cpp

@@ -445,9 +445,6 @@ public:
                 if (fUi.window == nullptr)
                     return pData->engine->callback(ENGINE_CALLBACK_UI_STATE_CHANGED, pData->id, -1, 0, 0.0f, msg);
 
-                if (uintptr_t winId = pData->engine->getOptions().frontendWinId)
-                    fUi.window->setTransientWinId(winId);
-
                 QString guiTitle(QString("%1 (GUI)").arg(pData->name));
                 fUi.window->setTitle(guiTitle.toUtf8().constData());
             }

source/backend/standalone/CarlaStandalone.cpp

@@ -1137,7 +1137,7 @@ void carla_set_engine_option(EngineOption option, int value, const char* valueSt
 
     case CB::ENGINE_OPTION_FRONTEND_WIN_ID:
         CARLA_SAFE_ASSERT_RETURN(valueStr != nullptr && valueStr[0] != '\0',);
-        const long winId(std::atol(valueStr));
+        const long long winId(std::strtoll(valueStr, nullptr, 16));
         CARLA_SAFE_ASSERT_RETURN(winId >= 0,);
         gStandalone.engineOptions.frontendWinId = static_cast<uintptr_t>(winId);
         break;

source/carla

@@ -294,13 +294,6 @@ class CarlaHostW(HostWindow):
 
     # -----------------------------------------------------------------
 
-    def showEvent(self, event):
-        HostWindow.showEvent(self, event)
-
-        # set our gui as parent for all plugins UIs
-        if gCarla.host is not None:
-            gCarla.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, str(self.winId()))
-
     def resizeEvent(self, event):
         HostWindow.resizeEvent(self, event)
         self.updateInfoLabelXandSize()

source/carla-patchbay

@@ -32,15 +32,6 @@ class CarlaHostW(HostWindow):
         self.fContainer = CarlaPatchbayW(self)
         self.setupContainer(True, self.fContainer.themeData)
 
-    # -----------------------------------------------------------------
-
-    def showEvent(self, event):
-        HostWindow.showEvent(self, event)
-
-        # set our gui as parent for all plugins UIs
-        if gCarla.host is not None:
-            gCarla.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, str(self.winId()))
-
 # ------------------------------------------------------------------------------------------------------------
 # Main
 

source/carla-plugin

@@ -552,13 +552,6 @@ class CarlaMiniW(HostWindow, ExternalUI):
     # -------------------------------------------------------------------
     # Qt events
 
-    def showEvent(self, event):
-        HostWindow.showEvent(self, event)
-
-        # set our gui as parent for all plugins UIs
-        if gCarla.host is not None:
-            gCarla.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, str(self.winId()))
-
     def closeEvent(self, event):
         self.closeExternalUI()
         HostWindow.closeEvent(self, event)

source/carla-rack

@@ -32,15 +32,6 @@ class CarlaHostW(HostWindow):
         self.fContainer = CarlaRackW(self)
         self.setupContainer(False)
 
-    # -----------------------------------------------------------------
-
-    def showEvent(self, event):
-        HostWindow.showEvent(self, event)
-
-        # set our gui as parent for all plugins UIs
-        if gCarla.host is not None:
-            gCarla.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, str(self.winId()))
-
 # ------------------------------------------------------------------------------------------------------------
 # Main
 

source/carla_host.py

@@ -1155,6 +1155,13 @@ class HostWindow(QMainWindow):
 
     # -----------------------------------------------------------------
 
+    def showEvent(self, event):
+        QMainWindow.showEvent(self, event)
+
+        # set our gui as parent for all plugins UIs
+        if gCarla.host is not None:
+            gCarla.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, "%x" % self.winId())
+
     def timerEvent(self, event):
         if event.timerId() == self.fIdleTimerFast:
             #if not gCarla.isPlugin:

source/modules/dgl/src/Window.cpp

@@ -426,7 +426,9 @@ public:
             XSizeHints sizeHints;
             memset(&sizeHints, 0, sizeof(sizeHints));
 
-            sizeHints.flags      = PMinSize|PMaxSize;
+            sizeHints.flags      = PSize|PMinSize|PMaxSize;
+            sizeHints.width      = static_cast<int>(width);
+            sizeHints.height     = static_cast<int>(height);
             sizeHints.min_width  = static_cast<int>(width);
             sizeHints.min_height = static_cast<int>(height);
             sizeHints.max_width  = static_cast<int>(width);