History

Merge branch 'master' into M22147

# Conflicts: # interface/src/scripting/DesktopScriptingInterface.h # interface/src/ui/InteractiveWindow.h

David Rowe committed 7 years ago

Commit 414f2722 parents 9c12a39 154844341 files · +1057 −132Browse files

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

Unified · Split

interface/src/scripting/DesktopScriptingInterface.cpp+11−0
@@ -22,6 +22,13 @@ · 21 unmodified lines
22#include <DependencyManager.h>22#include <DependencyManager.h>
23#include <OffscreenUi.h>23#include <OffscreenUi.h>
24 24
25static const QVariantMap DOCK_AREA {
26 { "TOP", DockArea::TOP },
27 { "BOTTOM", DockArea::BOTTOM },
28 { "LEFT", DockArea::LEFT },
29 { "RIGHT", DockArea::RIGHT }
30};
31
25int DesktopScriptingInterface::getWidth() {32int DesktopScriptingInterface::getWidth() {
26 QSize size = qApp->getWindow()->windowHandle()->screen()->virtualSize();33 QSize size = qApp->getWindow()->windowHandle()->screen()->virtualSize();
27 return size.width();34 return size.width();
@@ -46,6 +53,10 @@ QVariantMap DesktopScriptingInterface::getPresentationMode() { · 18 unmodified lines
46 return presentationModes;53 return presentationModes;
47}54}
48 55
56QVariantMap DesktopScriptingInterface::getDockArea() {
57 return DOCK_AREA;
58}
59
49void DesktopScriptingInterface::setHUDAlpha(float alpha) {60void DesktopScriptingInterface::setHUDAlpha(float alpha) {
50 qApp->getApplicationCompositor().setAlpha(alpha);61 qApp->getApplicationCompositor().setAlpha(alpha);
51}62}