Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/compositor/extensions/qwaylandxdgshellintegration.cpp

Change-Id: I3e8666d0c2fd047f12daeb94b2c967c646576ed9

1 files changed, 3 insertions, 4 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index 0b22cc1c3..7e4d68668 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -93,11 +93,10 @@ bool XdgShellIntegration::mouseMoveEvent(QMouseEvent *event)
 
 bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event)
 {
+    Q_UNUSED(event);
+
     if (grabberState == GrabberState::Resize) {
-        float scaleFactor = m_item->view()->output()->scaleFactor();
-        QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
-        QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
-        m_xdgSurface->sendUnMaximized(newSize);
+        m_xdgSurface->sendUnMaximized();
         grabberState = GrabberState::Default;
         return true;
     } else if (grabberState == GrabberState::Move) {