Fix UI element placement

This commit is contained in:
Brad Davis 2015-07-29 09:19:09 -07:00
parent 3fa7c7b516
commit f0d0979ade

View file

@ -377,7 +377,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) {
} }
glm::vec2 ControllerScriptingInterface::getViewportDimensions() const { glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
return Application::getInstance()->getCanvasSize(); return Application::getInstance()->getUiSize();
} }
AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) { AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
@ -507,4 +507,4 @@ const unsigned int INPUTCONTROLLER_KEY_DEVICE_MASK = 16;
InputController::Key InputController::getKey() const { InputController::Key InputController::getKey() const {
return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId); return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId);
} }