# Conflicts: # scripts/system/libraries/entitySelectionTool.js
Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 149 files). Show all
Unified · Split
| @@ -374,11 +374,11 @@ QString WindowScriptingInterface::protocolSignature() { · 373 unmodified lines | |||
| 374 | } | 374 | } |
| 375 | 375 | ||
| 376 | int WindowScriptingInterface::getInnerWidth() { | 376 | int WindowScriptingInterface::getInnerWidth() { |
| 377 | return qApp->getDeviceSize().x; | 377 | return qApp->getWindow()->geometry().width(); |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | int WindowScriptingInterface::getInnerHeight() { | 380 | int WindowScriptingInterface::getInnerHeight() { |
| 381 | return qApp->getDeviceSize().y; | 381 | return qApp->getWindow()->geometry().height() - qApp->getPrimaryMenu()->geometry().height(); |
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | glm::vec2 WindowScriptingInterface::getDeviceSize() const { | 384 | glm::vec2 WindowScriptingInterface::getDeviceSize() const { |