Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 22:27:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to make screen descriptions include more info

Browse source
This commit is contained in:
Dale Glass 2023-01-06 20:35:57 +01:00
parent 8884988336
commit de36c716c8
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/scripting/RenderScriptingInterface.cpp
View file

@ -208,7 +208,7 @@ QStringList RenderScriptingInterface::getScreens() const {
QStringList screens;
for(QScreen *screen : qApp->screens()) {
screens << screen->model();
screens << getNameForScreen(screen);
}
return screens;

6
interface/src/scripting/RenderScriptingInterface.h
View file

@ -14,7 +14,7 @@
#include "RenderForward.h"
#include "AntialiasingEffect.h"
#include <QScreen>
/*@jsdoc
* The <code>Render</code> 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.

8
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
View file

@ -20,6 +20,7 @@
#include <PathUtils.h>
#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<QString> _fullScreenScreenSetting { "fullScreenScreen", "" };
QString selectedModel = _fullScreenScreenSetting.get();
for(QScreen *screen : qApp->screens()) {
if (screen->model() == selectedModel) {
if (getNameForScreen(screen) == selectedModel) {
return screen;
}
}