Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I6d63f7390a3d26ce8c63c8e5de63b673d6831395

1 files changed, 10 insertions, 5 deletions

diff --git a/src/client/qwaylandabstractdecoration.cpp b/src/client/qwaylandabstractdecoration.cpp
index 0f00b989..87dd6cea 100644
--- a/src/client/qwaylandabstractdecoration.cpp
+++ b/src/client/qwaylandabstractdecoration.cpp
@@ -100,14 +100,19 @@ void QWaylandAbstractDecoration::setWaylandWindow(QWaylandWindow *window)
     d->m_wayland_window = window;
 }
 
-// \a size is without margins
+// Creates regions like this on the outside of a rectangle with inner size \a size
+// -----
+// |   |
+// -----
+// I.e. the top and bottom extends into the corners
 static QRegion marginsRegion(const QSize &size, const QMargins &margins)
 {
     QRegion r;
-    r += QRect(0, 0, size.width(), margins.top()); // top
-    r += QRect(0, size.height()+margins.top(), size.width(), margins.bottom()); //bottom
-    r += QRect(0, 0, margins.left(), size.height()); //left
-    r += QRect(size.width()+margins.left(), 0, margins.right(), size.height()); // right
+    const int widthWithMargins = margins.left() + size.width() + margins.right();
+    r += QRect(0, 0, widthWithMargins, margins.top()); // top
+    r += QRect(0, size.height()+margins.top(), widthWithMargins, margins.bottom()); //bottom
+    r += QRect(0, margins.top(), margins.left(), size.height()); //left
+    r += QRect(size.width()+margins.left(), margins.top(), margins.right(), size.height()); // right
     return r;
 }