diff --git a/interface/src/scripting/RenderScriptingInterface.cpp b/interface/src/scripting/RenderScriptingInterface.cpp index 515aeb8c29..76375b0eda 100644 --- a/interface/src/scripting/RenderScriptingInterface.cpp +++ b/interface/src/scripting/RenderScriptingInterface.cpp @@ -208,7 +208,7 @@ QStringList RenderScriptingInterface::getScreens() const { QStringList screens; for(QScreen *screen : qApp->screens()) { - screens << screen->model(); + screens << getNameForScreen(screen); } return screens; diff --git a/interface/src/scripting/RenderScriptingInterface.h b/interface/src/scripting/RenderScriptingInterface.h index f107ae06d4..0596213f8d 100644 --- a/interface/src/scripting/RenderScriptingInterface.h +++ b/interface/src/scripting/RenderScriptingInterface.h @@ -14,7 +14,7 @@ #include "RenderForward.h" #include "AntialiasingEffect.h" - +#include /*@jsdoc * The Render API enables you to configure the graphics engine. @@ -74,6 +74,10 @@ public: // Need to be called on start up to re-initialize the runtime to the saved setting states void loadSettings(); + static QString getNameForScreen(QScreen *screen) { + return screen->model() + " (" + screen->name() + ", " + screen->serialNumber() + ")"; + } + public slots: /*@jsdoc * Gets the configuration for a rendering job by name. diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp index a278f0cad9..49e27966b4 100644 --- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp @@ -20,6 +20,7 @@ #include #include "SettingHandle.h" + const QString Basic2DWindowOpenGLDisplayPlugin::NAME("Desktop"); static const QString FULLSCREEN = "Fullscreen"; @@ -166,12 +167,17 @@ bool Basic2DWindowOpenGLDisplayPlugin::isThrottled() const { return _isThrottled; } + +static QString getNameForScreen(QScreen *screen) { + return screen->model() + " (" + screen->name() + ", " + screen->serialNumber() + ")"; +} + QScreen* Basic2DWindowOpenGLDisplayPlugin::getFullscreenTarget() { Setting::Handle _fullScreenScreenSetting { "fullScreenScreen", "" }; QString selectedModel = _fullScreenScreenSetting.get(); for(QScreen *screen : qApp->screens()) { - if (screen->model() == selectedModel) { + if (getNameForScreen(screen) == selectedModel) { return screen; } }