Merge branch 'master' of github.com:highfidelity/hifi into SUI/imagesNoGlyphs

This commit is contained in:
Zach Fox 2019-05-16 10:57:44 -07:00
commit ccaabbd9ae

View file

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