From a3c8b2792d2df9faf23a87e17c5450f2c8f734e4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 4 Apr 2018 09:42:05 +1200 Subject: [PATCH] Fix Window.geometryChanged() values for moving and resizing window --- interface/src/scripting/WindowScriptingInterface.cpp | 2 +- libraries/ui/src/MainWindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index 7ca4e495b1..f65142f875 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -401,7 +401,7 @@ void WindowScriptingInterface::onWindowGeometryChanged(const QRect& windowGeomet auto geometry = windowGeometry; auto menu = qApp->getPrimaryMenu(); if (menu) { - geometry.setHeight(geometry.height() - menu->geometry().height()); + geometry.setY(geometry.y() + menu->geometry().height()); } emit geometryChanged(geometry); } diff --git a/libraries/ui/src/MainWindow.cpp b/libraries/ui/src/MainWindow.cpp index 091fd850af..f9fc71e417 100644 --- a/libraries/ui/src/MainWindow.cpp +++ b/libraries/ui/src/MainWindow.cpp @@ -79,12 +79,12 @@ void MainWindow::closeEvent(QCloseEvent* event) { } void MainWindow::moveEvent(QMoveEvent* event) { - emit windowGeometryChanged(QRect(event->pos(), size())); + emit windowGeometryChanged(QRect(QPoint(geometry().x(), geometry().y()), size())); // Geometry excluding the window frame. QMainWindow::moveEvent(event); } void MainWindow::resizeEvent(QResizeEvent* event) { - emit windowGeometryChanged(QRect(QPoint(x(), y()), event->size())); + emit windowGeometryChanged(QRect(QPoint(geometry().x(), geometry().y()), size())); // Geometry excluding the window frame. QMainWindow::resizeEvent(event); }