History

Merge branch 'master' into remove-deprecated-items

# Conflicts: # scripts/system/libraries/entitySelectionTool.js

David Rowe committed 8 years ago

Commit 033b85a2 parents 615e546 f3918ad149 files · +2946 −3903Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 149 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+2−2
@@ -374,11 +374,11 @@ QString WindowScriptingInterface::protocolSignature() { · 373 unmodified lines
374}374}
375 375
376int WindowScriptingInterface::getInnerWidth() {376int WindowScriptingInterface::getInnerWidth() {
377 return qApp->getDeviceSize().x;377 return qApp->getWindow()->geometry().width();
378}378}
379 379
380int WindowScriptingInterface::getInnerHeight() {380int WindowScriptingInterface::getInnerHeight() {
381 return qApp->getDeviceSize().y;381 return qApp->getWindow()->geometry().height() - qApp->getPrimaryMenu()->geometry().height();
382}382}
383 383
384glm::vec2 WindowScriptingInterface::getDeviceSize() const {384glm::vec2 WindowScriptingInterface::getDeviceSize() const {