Merge c129f19 into fb9da46

doc/downloads/index.js

@@ -37,6 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
+                       { "change": "<strong>General:</strong> only handle a URL when OpenCOR is visible and no modal dialog is active (see issue <a href=\"https://github.com/opencor/opencor/issues/1802\">#1802</a>)." },
                        { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.27.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1799\">#1799</a>)." }
                      ]
                    },

src/main.cpp

@@ -27,12 +27,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "guiapplication.h"
 #include "guiutils.h"
 #include "mainwindow.h"
-#include "splashscreenwindow.h"
 
 #ifdef Q_OS_MAC
     #include "macos.h"
 #endif
 
+#ifndef QT_DEBUG
+    #include "splashscreenwindow.h"
+#endif
+
 //==============================================================================
 
 #include <QDir>

src/mainwindow.cpp

@@ -55,6 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QRect>
 #include <QSettings>
 #include <QShortcut>
+#include <QTimer>
 #include <QUrl>
 #include <QWindow>
 
@@ -1038,8 +1039,13 @@ void MainWindow::openFileOrHandleUrl(const QString &pFileNameOrOpencorUrl)
 
 //==============================================================================
 
-void MainWindow::handleUrl(const QUrl &pUrl)
+void MainWindow::doHandleUrl(const QUrl &pUrl)
 {
+    // Make sure that no modal dialog is active
+
+    if (qApp->activeModalWidget())
+        return;
+
     // Handle the action that was passed to OpenCOR
 
     QString actionName = pUrl.authority();
@@ -1096,6 +1102,26 @@ void MainWindow::handleUrl(const QUrl &pUrl)
 
 //==============================================================================
 
+void MainWindow::handleUrl(const QUrl &pUrl)
+{
+    // Handle the action that was passed to OpenCOR
+    // Note: we want to make sure that we are visible before handling a URL,
+    //       hence we do this through a single shot. Indeed, otherwise to start
+    //       OpenCOR through our URL scheme (e.g. opencor://openAboutDialog)
+    //       will result in the dialog appearing before we become visible, which
+    //       doesn't look neat. Not only that, but it might in some cases (e.g.
+    //       opencor://openPreferencesDialog) result in some GUI problems (see
+    //       issue #1802). When it comes to opening a file / files through our
+    //       URL scheme, it's kind of the same in the sense that without a
+    //       single shot, the file/s will get opened in the "background", which
+    //       is not neat either...
+
+    QTimer::singleShot(0, this, std::bind(&MainWindow::doHandleUrl,
+                                          this, pUrl));
+}
+
+//==============================================================================
+
 void MainWindow::handleMessage(const QString &pMessage)
 {
     // We have just received a message, which means that the user tried to run

src/mainwindow.h

@@ -157,6 +157,7 @@ private slots:
 
     void resetAll();
 
+    void doHandleUrl(const QUrl &pUrl);
     void handleUrl(const QUrl &pUrl);
 };
 

src/splashscreenwindow.cpp

@@ -129,38 +129,33 @@ void SplashScreenWindow::closeAndDeleteAfter(QWidget *pWindow)
 {
     // Wait for our window to expose itself
 
-    if (pWindow) {
-        QWindow *window = pWindow->windowHandle();
+    enum {
+        TimeOut = 1000,
+        ShortDelay = 10
+    };
 
-        if (window) {
-            enum {
-                TimeOut = 1000,
-                ShortDelay = 10
-            };
-
-            QElapsedTimer timer;
+    QWindow *window = pWindow->windowHandle();
+    QElapsedTimer timer;
 #ifndef Q_OS_WIN
-            struct timespec shortDelaySpec = { ShortDelay/1000, 1000000*(ShortDelay%1000) };
+    struct timespec shortDelaySpec = { ShortDelay/1000, 1000000*(ShortDelay%1000) };
 #endif
 
-            timer.start();
+    timer.start();
 
-            while (!window->isExposed()) {
-                int remaining = int(TimeOut-timer.elapsed());
+    while (!window->isExposed()) {
+        int remaining = int(TimeOut-timer.elapsed());
 
-                if (remaining <= 0)
-                    break;
+        if (remaining <= 0)
+            break;
 
-                QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
-                QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
+        QCoreApplication::processEvents(QEventLoop::AllEvents, remaining);
+        QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete);
 
 #ifdef Q_OS_WIN
-                Sleep(ShortDelay);
+        Sleep(ShortDelay);
 #else
-                nanosleep(&shortDelaySpec, nullptr);
+        nanosleep(&shortDelaySpec, nullptr);
 #endif
-            }
-        }
     }
 
     // Close ourselves with a bit of a delay