From d27cda1fa207f3beabac97fe30b747cf53059191 Mon Sep 17 00:00:00 2001 From: Matt Gajownik Date: Thu, 24 Nov 2022 18:13:15 +1100 Subject: [PATCH] UI: Fix monitor name for projectors on Windows From Qt 6.4 release notes: QScreen::name() now returns the user friendly name instead of the GDI device name on Windows. This is consistent with other platforms and also obeys the documentation. -- Additionally, this scraps the visual indexing on monitors as the numbering is not guaranteed to match any other GUI or API. A similar change was recently made in the Display Capture source on Windows. --- UI/window-basic-main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 87f2b16fb..a3b8c6560 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -5061,13 +5061,13 @@ void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target, QRect screenGeometry = screen->geometry(); qreal ratio = screen->devicePixelRatio(); QString name = ""; -#ifdef _WIN32 +#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0) QTextStream fullname(&name); fullname << GetMonitorName(screen->name()); fullname << " ("; fullname << (i + 1); fullname << ")"; -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(_WIN32) name = screen->name(); #else name = screen->model().simplified();