mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

UI: Fix monitor name for projectors on Windows

Browse Source 
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.
This commit is contained in:
Matt Gajownik 2022-11-24 18:13:15 +11:00
parent dd61943ddf
commit d27cda1fa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/window-basic-main.cpp
View File

@ -5061,13 +5061,13 @@ void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target,
QRect screenGeometry = screen->geometry(); QRect screenGeometry = screen->geometry();
qreal ratio = screen->devicePixelRatio(); qreal ratio = screen->devicePixelRatio();
QString name = ""; QString name = "";
#ifdef _WIN32 #if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
QTextStream fullname(&name); QTextStream fullname(&name);
fullname << GetMonitorName(screen->name()); fullname << GetMonitorName(screen->name());
fullname << " ("; fullname << " (";
fullname << (i + 1); fullname << (i + 1);
fullname << ")"; fullname << ")";
#elif defined(__APPLE__) #elif defined(__APPLE__) || defined(_WIN32)
name = screen->name(); name = screen->name();
#else #else
name = screen->model().simplified(); name = screen->model().simplified();