ui: use QOpenGLWindow instead of QOpenGLWidget for all panels

app/widget/manageddisplay/manageddisplay.cpp

@@ -61,11 +61,14 @@ ManagedDisplayWidget::ManagedDisplayWidget(QWidget *parent) :
 
     // Create OpenGL renderer
     attached_renderer_ = new OpenGLRenderer(this);
+
+    // Create widget wrapper for OpenGL window
+    wrapper_ = QWidget::createWindowContainer(static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_));
+    layout->addWidget(wrapper_);
   } else {
     inner_widget_ = nullptr;
+    wrapper_ = nullptr;
   }
-
-  layout->addWidget(inner_widget_);
 }
 
 ManagedDisplayWidget::~ManagedDisplayWidget()
@@ -253,6 +256,22 @@ void ManagedDisplayWidget::doneCurrent()
   }
 }
 
+QPaintDevice *ManagedDisplayWidget::paint_device() const
+{
+  if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {
+    return static_cast<ManagedDisplayWidgetOpenGL*>(inner_widget_);
+  } else {
+    return nullptr;
+  }
+}
+
+void ManagedDisplayWidget::SetInnerMouseTracking(bool e)
+{
+  if (wrapper_) {
+    wrapper_->setMouseTracking(e);
+  }
+}
+
 void ManagedDisplayWidget::update()
 {
   if (RenderManager::instance()->backend() == RenderManager::kOpenGL) {

app/widget/manageddisplay/manageddisplay.h

@@ -23,7 +23,7 @@
 
 #include <QMouseEvent>
 #include <QOpenGLContext>
-#include <QOpenGLWidget>
+#include <QOpenGLWindow>
 
 #include "node/color/colormanager/colormanager.h"
 #include "render/renderer.h"
@@ -31,14 +31,11 @@
 
 namespace olive {
 
-class ManagedDisplayWidgetOpenGL : public QOpenGLWidget
+class ManagedDisplayWidgetOpenGL : public QOpenGLWindow
 {
   Q_OBJECT
 public:
-  ManagedDisplayWidgetOpenGL(QWidget* parent = nullptr) :
-    QOpenGLWidget(parent)
-  {
-  }
+  ManagedDisplayWidgetOpenGL() = default;
 
 signals:
   void OnInit();
@@ -67,7 +64,7 @@ protected:
   {
     emit OnMouseMove(e);
 
-    QOpenGLWidget::mouseMoveEvent(e);
+    QOpenGLWindow::mouseMoveEvent(e);
   }
 
 private slots:
@@ -188,11 +185,26 @@ protected:
 
   void doneCurrent();
 
-  QWidget* inner_widget() const
+  QWindow* inner_widget() const
   {
     return inner_widget_;
   }
 
+  /**
+   * @brief Get inner widget as paint device for QPainter
+   *
+   * NOTE: This will be incompatible with QVulkanWindow so functions using it
+   *       will need to be replaced soon.
+   */
+  QPaintDevice *paint_device() const;
+
+  void SetInnerMouseTracking(bool e);
+
+  QRect GetInnerRect() const
+  {
+    return wrapper_ ? wrapper_->rect() : QRect();
+  }
+
 protected slots:
   /**
    * @brief Called whenever the internal rendering context has been created
@@ -223,7 +235,8 @@ private:
   /**
    * @brief Main drawing surface abstraction
    */
-  QWidget* inner_widget_;
+  QWindow* inner_widget_;
+  QWidget *wrapper_;
 
   /**
    * @brief Renderer abstraction