History

Move screen naming to UI library, and improve naming

Dale Glass committed 3 years ago

Commit 1cf37561 parent de36c715 files · +86 −10Browse files

Showing the changes to interface/src/scripting/RenderScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

interface/src/scripting/RenderScriptingInterface.cpp+3−1
@@ -9,6 +9,7 @@ · 8 unmodified lines
9 9
10#include "LightingModel.h"10#include "LightingModel.h"
11#include <QScreen>11#include <QScreen>
12#include "ScreenName.h"
12 13
13 14
14RenderScriptingInterface* RenderScriptingInterface::getInstance() {15RenderScriptingInterface* RenderScriptingInterface::getInstance() {
@@ -24,6 +25,7 @@ RenderScriptingInterface::RenderScriptingInterface() { · 9 unmodified lines
24 });25 });
25}26}
26 27
28
27void RenderScriptingInterface::loadSettings() {29void RenderScriptingInterface::loadSettings() {
28 _renderSettingLock.withReadLock([&] {30 _renderSettingLock.withReadLock([&] {
29 _renderMethod = (_renderMethodSetting.get());31 _renderMethod = (_renderMethodSetting.get());
@@ -208,7 +210,7 @@ QStringList RenderScriptingInterface::getScreens() const { · 178 unmodified lines
208 QStringList screens;210 QStringList screens;
209 211
210 for(QScreen *screen : qApp->screens()) {212 for(QScreen *screen : qApp->screens()) {
211 screens << getNameForScreen(screen);213 screens << ScreenName::getNameForScreen(screen);
212 }214 }
213 215
214 return screens;216 return screens;