Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Iaab37b633a8286c2c21425aaac34d30529a3ea82

6 files changed, 44 insertions, 22 deletions

diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 2591966d54..820f00560a 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -1006,6 +1006,13 @@ QByteArray QWindowsContext::comErrorString(HRESULT hr)
     return result;
 }
 
+void QWindowsContext::forceNcCalcSize(HWND hwnd)
+{
+    // Force WM_NCCALCSIZE to adjust margin
+    SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
+                 SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
+}
+
 bool QWindowsContext::systemParametersInfo(unsigned action, unsigned param, void *out,
                                            unsigned dpi)
 {
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 1831ac6ec0..c89b8b91f4 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -249,6 +249,8 @@ public:
     bool asyncExpose() const;
     void setAsyncExpose(bool value);
 
+    static void forceNcCalcSize(HWND hwnd);
+
     static bool systemParametersInfo(unsigned action, unsigned param, void *out, unsigned dpi = 0);
     static bool systemParametersInfoForScreen(unsigned action, unsigned param, void *out,
                                               const QPlatformScreen *screen = nullptr);
diff --git a/src/plugins/platforms/windows/qwindowsmenu.cpp b/src/plugins/platforms/windows/qwindowsmenu.cpp
index 7c3e87eec1..d29830b394 100644
--- a/src/plugins/platforms/windows/qwindowsmenu.cpp
+++ b/src/plugins/platforms/windows/qwindowsmenu.cpp
@@ -794,20 +794,13 @@ QWindowsMenuBar *QWindowsMenuBar::menuBarOf(const QWindow *notYetCreatedWindow)
         ? qobject_cast<QWindowsMenuBar *>(menuBarV.value<QObject *>()) : nullptr;
 }
 
-static inline void forceNcCalcSize(HWND hwnd)
-{
-    // Force WM_NCCALCSIZE to adjust margin: Does not appear to work?
-    SetWindowPos(hwnd, nullptr, 0, 0, 0, 0,
-                 SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER);
-}
-
 void QWindowsMenuBar::install(QWindowsWindow *window)
 {
     const HWND hwnd = window->handle();
     const BOOL result = SetMenu(hwnd, m_hMenuBar);
     if (result) {
         window->setMenuBar(this);
-        forceNcCalcSize(hwnd);
+        QWindowsContext::forceNcCalcSize(hwnd);
     }
 }
 
@@ -817,7 +810,7 @@ void QWindowsMenuBar::removeFromWindow()
         const HWND hwnd = window->handle();
         SetMenu(hwnd, nullptr);
         window->setMenuBar(nullptr);
-        forceNcCalcSize(hwnd);
+        QWindowsContext::forceNcCalcSize(hwnd);
     }
 }
 
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 0c99dfab4c..8191bbb42b 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -2442,7 +2442,17 @@ void QWindowsWindow::setFullFrameMargins(const QMargins &newMargins)
 
 void QWindowsWindow::updateFullFrameMargins()
 {
-    // Normally obtained from WM_NCCALCSIZE
+    // QTBUG-82580: If a native menu is present, force a WM_NCCALCSIZE.
+    if (GetMenu(m_data.hwnd))
+        QWindowsContext::forceNcCalcSize(m_data.hwnd);
+    else
+        calculateFullFrameMargins();
+}
+
+void QWindowsWindow::calculateFullFrameMargins()
+{
+    // Normally obtained from WM_NCCALCSIZE. This calculation only works
+    // when no native menu is present.
     const auto systemMargins = testFlag(DisableNonClientScaling)
         ? QWindowsGeometryHint::frameOnPrimaryScreen(m_data.hwnd)
         : frameMargins_sys();
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index e1f7908687..b35081d41d 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -373,6 +373,7 @@ private:
     void handleWindowStateChange(Qt::WindowStates state);
     inline void destroyIcon();
     void fireExpose(const QRegion &region, bool force=false);
+    void calculateFullFrameMargins();
 
     mutable QWindowsWindowData m_data;
     QPointer<QWindowsMenuBar> m_menuBar;
diff --git a/src/plugins/platforms/winrt/qwinrtservices.cpp b/src/plugins/platforms/winrt/qwinrtservices.cpp
index b27c408f40..04d7417801 100644
--- a/src/plugins/platforms/winrt/qwinrtservices.cpp
+++ b/src/plugins/platforms/winrt/qwinrtservices.cpp
@@ -43,6 +43,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QCoreApplication>
 #include <QtCore/qfunctions_winrt.h>
+#include <private/qeventdispatcher_winrt_p.h>
 
 #include <wrl.h>
 #include <windows.foundation.h>
@@ -94,13 +95,17 @@ bool QWinRTServices::openUrl(const QUrl &url)
     HRESULT hr = d->uriFactory->CreateUri(uriString.Get(), &uri);
     RETURN_FALSE_IF_FAILED("Failed to create URI from QUrl.");
 
-    ComPtr<IAsyncOperation<bool>> op;
-    hr = d->launcher->LaunchUriAsync(uri.Get(), &op);
-    RETURN_FALSE_IF_FAILED("Failed to start URI launch.");
-
     boolean result;
-    hr = QWinRTFunctions::await(op, &result);
-    RETURN_FALSE_IF_FAILED("Failed to launch URI.");
+    hr = QEventDispatcherWinRT::runOnXamlThread([this, d, uri, &result]() {
+        ComPtr<IAsyncOperation<bool>> op;
+        HRESULT hr = d->launcher->LaunchUriAsync(uri.Get(), &op);
+        RETURN_HR_IF_FAILED("Failed to start URI launch.");
+
+        hr = QWinRTFunctions::await(op, &result);
+        RETURN_HR_IF_FAILED("Failed to launch URI.");
+        return hr;
+    });
+    RETURN_FALSE_IF_FAILED("Failed to launch URI from Xaml thread.");
 
     return result;
 }
@@ -131,12 +136,16 @@ bool QWinRTServices::openDocument(const QUrl &url)
 
     boolean result;
     {
-        ComPtr<IAsyncOperation<bool>> op;
-        hr = d->launcher->LaunchFileAsync(file.Get(), &op);
-        RETURN_FALSE_IF_FAILED("Failed to start file launch.");
-
-        hr = QWinRTFunctions::await(op, &result);
-        RETURN_FALSE_IF_FAILED("Failed to launch file.");
+        hr = QEventDispatcherWinRT::runOnXamlThread([this, d, file, &result]() {
+            ComPtr<IAsyncOperation<bool>> op;
+            HRESULT hr = d->launcher->LaunchFileAsync(file.Get(), &op);
+            RETURN_HR_IF_FAILED("Failed to start file launch.");
+
+            hr = QWinRTFunctions::await(op, &result);
+            RETURN_HR_IF_FAILED("Failed to launch file.");
+            return hr;
+        });
+        RETURN_FALSE_IF_FAILED("Failed to launch file from Xaml thread.");
     }
 
     return result;