Create the native window in the root widget

- refs #13376
MythTV · Jan 13, 2019 · f738ae1 · f738ae1
1 parent 2b783da
commit f738ae1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -326,10 +326,16 @@ MythNotificationCenter *GetNotificationCenter(void)
 MythPainterWindowGL::MythPainterWindowGL(MythMainWindow *win,
                                          MythMainWindowPrivate *priv,
                                          MythRenderOpenGL *rend)
-            : QWidget(win), parent(win), d(priv), render(rend)
+  : QWidget(win),
+    parent(win),
+    d(priv),
+    render(rend)
 {
-    rend->setWidget(this);
     setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_NativeWindow);
+    setAttribute(Qt::WA_DontCreateNativeAncestors);
+    winId();
+    render->setWidget(this);
 }
 
 QPaintEngine *MythPainterWindowGL::paintEngine() const

diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -160,18 +160,17 @@ void MythRenderOpenGL::swapBuffers()
     QOpenGLContext::swapBuffers(m_window);
 }
 
-void MythRenderOpenGL::setWidget(QWidget *w)
+void MythRenderOpenGL::setWidget(QWidget *Widget)
 {
-    if (!w)
+    if (!Widget)
         return;
 
-    w->winId(); // Ensure native window
-    m_window = w->windowHandle();
+    m_window = Widget->windowHandle();
     if (!m_window)
     {
-        w = w->nativeParentWidget();
-        if (w)
-            m_window = w->windowHandle();
+        Widget = Widget->nativeParentWidget();
+        if (Widget)
+            m_window = Widget->windowHandle();
     }
 
 #ifdef ANDROID
@@ -185,8 +184,8 @@ void MythRenderOpenGL::setWidget(QWidget *w)
 
     if (!create())
         LOG(VB_GENERAL, LOG_WARNING, LOC + "setWidget create failed");
-    else if (w)
-        w->setAttribute(Qt::WA_PaintOnScreen);
+    else if (Widget)
+        Widget->setAttribute(Qt::WA_PaintOnScreen);
 }
 
 void MythRenderOpenGL::makeCurrent()

diff --git a/mythtv/libs/libmythui/mythrender_opengl.h b/mythtv/libs/libmythui/mythrender_opengl.h
@@ -103,7 +103,7 @@ class MUI_PUBLIC MythRenderOpenGL : protected QOpenGLContext, public MythRender
     virtual void doneCurrent();
 
     virtual void swapBuffers();
-    void setWidget(QWidget *w);
+    void setWidget(QWidget *Widget);
     bool IsDirectRendering() const;
 
     void  Init(void);