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
2222 #include <DependencyManager.h>
2323 #include <OffscreenUi.h>
2424
25+static const QVariantMap DOCK_AREA {
26+ { "TOP", DockArea::TOP },
27+ { "BOTTOM", DockArea::BOTTOM },
28+ { "LEFT", DockArea::LEFT },
29+ { "RIGHT", DockArea::RIGHT }
30+};
31+
2532 int DesktopScriptingInterface::getWidth() {
2633 QSize size = qApp->getWindow()->windowHandle()->screen()->virtualSize();
2734 return size.width();
@@ -46,6 +53,10 @@ QVariantMap DesktopScriptingInterface::getPresentationMode() { · 18 unmodified lines
4653 return presentationModes;
4754 }
4855
56+QVariantMap DesktopScriptingInterface::getDockArea() {
57+ return DOCK_AREA;
58+}
59+
4960 void DesktopScriptingInterface::setHUDAlpha(float alpha) {
5061 qApp->getApplicationCompositor().setAlpha(alpha);
5162 }