Merge pull request #12350 from ctrlaltdavid/21743

Fix the spectator camera
This commit is contained in:
Brad Hefta-Gaub 2018-02-06 19:55:02 -08:00 committed by GitHub
commit 0b6dea3d10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -396,11 +396,11 @@ QString WindowScriptingInterface::protocolSignature() {
} }
int WindowScriptingInterface::getInnerWidth() { int WindowScriptingInterface::getInnerWidth() {
return qApp->getDeviceSize().x; return qApp->getWindow()->geometry().width();
} }
int WindowScriptingInterface::getInnerHeight() { int WindowScriptingInterface::getInnerHeight() {
return qApp->getDeviceSize().y; return qApp->getWindow()->geometry().height() - qApp->getPrimaryMenu()->geometry().height();
} }
glm::vec2 WindowScriptingInterface::getDeviceSize() const { glm::vec2 WindowScriptingInterface::getDeviceSize() const {