diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:46 +0200 |
| commit | eb5f02c5cc493d88bd9ff20cbf2b6ed531229263 (patch) | |
| tree | 0ddc2d2f4077db3c42a4d8cbee5c7c3554880162 /src/plugins/platforms/windows | |
| parent | 580572f3c9cb77283e63a58386002407957d7309 (diff) | |
| parent | f155c40fdc0b7bbc12804ba77c00e217ba6c2bb3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib615dbfd783c5a3cf0f130ff82965382ce5cfb5a
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 5539a6903c..ffc8f5ed21 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1937,8 +1937,10 @@ void QWindowsWindow::handleGeometryChange() { const QRect previousGeometry = m_data.geometry; m_data.geometry = geometry_sys(); - if (testFlag(WithinDpiChanged)) - return; // QGuiApplication will send resize + if (testFlag(WithinDpiChanged) + && QWindowsContext::instance()->screenManager().screenForHwnd(m_data.hwnd) != screen()) { + return; // QGuiApplication will send resize when screen actually changes + } QWindowSystemInterface::handleGeometryChange(window(), m_data.geometry); // QTBUG-32121: OpenGL/normal windows (with exception of ANGLE) do not receive // expose events when shrinking, synthesize. |