Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 19:12:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15568 from samcake/coco

Browse source 
BUGZ-145: Fix Window innerWidth and innerHeight after support for Docked window
This commit is contained in:
Sam Gateau 2019-05-16 10:02:20 -07:00 committed by GitHub
commit cf5869f199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/WindowScriptingInterface.cpp
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 {