jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2493 from WizardCM/unicode-projector-name

Browse Source 
UI: Support Unicode for Windows fullscreen projectors
This commit is contained in:
Jim 2020-03-13 06:51:08 -07:00 committed by GitHub
commit 7c444a311a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4137,11 +4137,15 @@ void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target,
QRect screenGeometry = screen->geometry();
QString name = "";
#ifdef _WIN32
DISPLAY_DEVICEA ddev;
DISPLAY_DEVICE ddev;
ddev.cb = sizeof(ddev);
EnumDisplayDevicesA(screen->name().toStdString().c_str(), 0,
&ddev, 1);
name = ddev.DeviceString;
BPtr<wchar_t> wideName;
os_utf8_to_wcs_ptr(screen->name().toStdString().c_str(), 0,
&wideName);
EnumDisplayDevices(wideName, 0, &ddev, 1);
BPtr<char> newName;
os_wcs_to_utf8_ptr(ddev.DeviceString, 0, &newName);
name = newName;
#elif defined(__APPLE__)
name = screen->name();
#elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)