Browse Source

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.
Matt Gajownik 2 years ago
parent
commit
d27cda1fa2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      UI/window-basic-main.cpp

+ 2 - 2
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();