1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Avoid accidentally copying QWindowsScreenManager

Browse Source 
Change-Id: I60b219e9a3ea62a96c369ee910eacf06d61f4f71
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 7d2488280ee46fd07f31c895b765ee4072fc1a5a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2022-06-15 23:36:12 +02:00 committed by Qt Cherry-pick Bot
parent a31e0e4189
commit 0d60b9d0af
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/windows/qwindowsscreen.h
View File

@ -92,6 +92,7 @@ private:
class QWindowsScreenManager class QWindowsScreenManager
{ {
Q_DISABLE_COPY_MOVE(QWindowsScreenManager)
public: public:
using WindowsScreenList = QList<QWindowsScreen *>; using WindowsScreenList = QList<QWindowsScreen *>;

2
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -571,7 +571,7 @@ void QWindowsTheme::refreshFonts()
if (!QGuiApplication::desktopSettingsAware()) if (!QGuiApplication::desktopSettingsAware())
return; return;
NONCLIENTMETRICS ncm; NONCLIENTMETRICS ncm;
auto screenManager = QWindowsContext::instance()->screenManager(); auto &screenManager = QWindowsContext::instance()->screenManager();
QWindowsContext::nonClientMetricsForScreen(&ncm, screenManager.screens().value(0)); QWindowsContext::nonClientMetricsForScreen(&ncm, screenManager.screens().value(0));
qCDebug(lcQpaWindows) << __FUNCTION__ << ncm; qCDebug(lcQpaWindows) << __FUNCTION__ << ncm;
const QFont menuFont = QWindowsFontDatabase::LOGFONT_to_QFont(ncm.lfMenuFont); const QFont menuFont = QWindowsFontDatabase::LOGFONT_to_QFont(ncm.lfMenuFont);

4
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -1059,7 +1059,7 @@ QMargins QWindowsGeometryHint::frame(const QWindow *w, HWND hwnd, DWORD style, D
return {}; return {};
if (QWindowsScreenManager::isSingleScreen()) if (QWindowsScreenManager::isSingleScreen())
return frameOnPrimaryScreen(w, style, exStyle); return frameOnPrimaryScreen(w, style, exStyle);
auto screenManager = QWindowsContext::instance()->screenManager(); auto &screenManager = QWindowsContext::instance()->screenManager();
auto screen = screenManager.screenForHwnd(hwnd); auto screen = screenManager.screenForHwnd(hwnd);
if (!screen) if (!screen)
screen = screenManager.screens().value(0); screen = screenManager.screens().value(0);
@ -1086,7 +1086,7 @@ QMargins QWindowsGeometryHint::frame(const QWindow *w, const QRect &geometry,
return frameOnPrimaryScreen(w, style, exStyle); return frameOnPrimaryScreen(w, style, exStyle);
} }
qreal dpi = 96; qreal dpi = 96;
auto screenManager = QWindowsContext::instance()->screenManager(); auto &screenManager = QWindowsContext::instance()->screenManager();
auto screen = screenManager.screenAtDp(geometry.center()); auto screen = screenManager.screenAtDp(geometry.center());
if (!screen) if (!screen)
screen = screenManager.screens().value(0); screen = screenManager.screens().value(0);