[vlc-commits] [Git][videolan/vlc][master] 2 commits: Revert "qt: show quick window after the user interface is loaded successfully in compositor_dcomp"

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
661f9e5d by Fatih Uzunoglu at 2024-05-24T10:52:19+00:00
Revert "qt: show quick window after the user interface is loaded successfully in compositor_dcomp"

This reverts commit b6da2c77cc274aa248a2b7d6489bbdcc7739827b.

- - - - -
9f2c91e9 by Fatih Uzunoglu at 2024-05-24T10:52:19+00:00
qt: show quick window after the user interface is loaded successfully in compositor_dcomp

- - - - -


1 changed file:

- modules/gui/qt/maininterface/compositor_dcomp.cpp


Changes:

=====================================
modules/gui/qt/maininterface/compositor_dcomp.cpp
=====================================
@@ -237,15 +237,11 @@ bool CompositorDirectComposition::makeMainInterface(MainCtx* mainCtx)
     connect(quickViewPtr,
             &QQuickWindow::sceneGraphInitialized,
             &eventLoop,
-            [&eventLoop, &appropriateGraphicsApi, quickViewPtr]() {
+            [&eventLoop, &appropriateGraphicsApi]() {
                 if (!(QQuickWindow::graphicsApi() == QSGRendererInterface::Direct3D11 ||
                       QQuickWindow::graphicsApi() == QSGRendererInterface::Direct3D12)) {
                     appropriateGraphicsApi = false;
                 }
-                else
-                {
-                    quickViewPtr->show();
-                }
                 eventLoop.quit();
         }, Qt::SingleShotConnection);
 
@@ -264,6 +260,11 @@ bool CompositorDirectComposition::makeMainInterface(MainCtx* mainCtx)
 
     const bool ret = commonGUICreate(quickViewPtr, quickViewPtr, flags);
 
+    if (ret)
+        m_quickView->show();
+    else
+        return false;
+
     if (!m_quickView->isSceneGraphInitialized())
         eventLoop.exec();
     return (ret && appropriateGraphicsApi);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3a165dacebe8bdf6b7f758efd9ec927ae7b91ac7...9f2c91e961658b08b882d6cf11a90b8b0c9ee331

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3a165dacebe8bdf6b7f758efd9ec927ae7b91ac7...9f2c91e961658b08b882d6cf11a90b8b0c9ee331
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance