History

Make Window.x and Window.y report top left of drawable area of window

David Rowe committed 8 years ago

Commit 6868ca91 parent a3c8b271 file · +4 −2Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+4−2
@@ -390,11 +390,13 @@ glm::vec2 WindowScriptingInterface::getDeviceSize() const { · 389 unmodified lines
390390 }
391391
392392 int WindowScriptingInterface::getX() {
393− return qApp->getWindow()->x();
393+ return qApp->getWindow()->geometry().x();
394394 }
395395
396396 int WindowScriptingInterface::getY() {
397− return qApp->getWindow()->y();
397+ auto menu = qApp->getPrimaryMenu();
398+ int menuHeight = menu ? menu->geometry().height() : 0;
399+ return qApp->getWindow()->geometry().y() + menuHeight;
398400 }
399401
400402 void WindowScriptingInterface::onWindowGeometryChanged(const QRect& windowGeometry) {