Get current screen after screenForHwnd

desktop-app · Oct 15, 2024 · 7a65cb8 · 7a65cb8
1 parent 8ef3d1f
commit 7a65cb8
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/qtbase_5.15.15/0027-backport-dpi-change-fixes.patch b/qtbase_5.15.15/0027-backport-dpi-change-fixes.patch
@@ -228,6 +228,21 @@ index 5c095808f2..c22c5ca50b 100644
 
      static bool isSingleScreen();
 
+diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
+index 9d9180e4f5..8a923a052f 100644
+--- a/src/plugins/platforms/windows/qwindowswindow.cpp
++++ b/src/plugins/platforms/windows/qwindowswindow.cpp
+@@ -1942,9 +1942,9 @@ void QWindowsWindow::checkForScreenChanged(ScreenChangeMode mode)
+     if (parent() || QWindowsScreenManager::isSingleScreen())
+         return;
+
+-    QPlatformScreen *currentScreen = screen();
+     const QWindowsScreen *newScreen =
+         QWindowsContext::instance()->screenManager().screenForHwnd(m_data.hwnd);
++    QPlatformScreen *currentScreen = screen();
+     if (newScreen == nullptr || newScreen == currentScreen)
+         return;
+     // For screens with different DPI: postpone until WM_DPICHANGE
 diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
 index ac207aa48f..27d467c3c6 100644
 --- a/src/plugins/platforms/windows/qwindowswindow.h