History

Fix UI element placement

Brad Davis committed 11 years ago

Commit f0d09791 parent 3fa7c7b1 file · +2 −2Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+2−2
@@ -377,7 +377,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) { · 376 unmodified lines
377377 }
378378
379379 glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
380− return Application::getInstance()->getCanvasSize();
380+ return Application::getInstance()->getUiSize();
381381 }
382382
383383 AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
@@ -507,4 +507,4 @@ const unsigned int INPUTCONTROLLER_KEY_DEVICE_MASK = 16; · 123 unmodified lines
507507
508508 InputController::Key InputController::getKey() const {
509509 return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId);
510−}
510+}