Added frameMargins() API and support in XCB plugin.

3 files changed, 47 insertions, 17 deletions

diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 3363ad7454..caaa065b64 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -641,24 +641,41 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
     QPoint oldPos = q->pos();
     data.crect = r;
 
+    bool needsShow = false;
+
+    if (w == 0 || h == 0) {
+        q->setAttribute(Qt::WA_OutsideWSRange, true);
+        if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))
+            hide_sys();
+        data.crect = QRect(x, y, w, h);
+    } else if (q->isVisible() && q->testAttribute(Qt::WA_OutsideWSRange)) {
+        q->setAttribute(Qt::WA_OutsideWSRange, false);
+        needsShow = true;
+    }
+
     if (q->isVisible()) {
-        if (q->windowHandle()) {
-            if (q->isWindow()) {
-                q->windowHandle()->setGeometry(q->geometry());
+        if (!q->testAttribute(Qt::WA_DontShowOnScreen) && !q->testAttribute(Qt::WA_OutsideWSRange)) {
+            if (q->windowHandle()) {
+                if (q->isWindow()) {
+                    q->windowHandle()->setGeometry(q->geometry());
+                } else {
+                    QPoint posInNativeParent =  q->mapTo(q->nativeParentWidget(),QPoint());
+                    q->windowHandle()->setGeometry(QRect(posInNativeParent,r.size()));
+                }
+                const QWidgetBackingStore *bs = maybeBackingStore();
+                if (bs->windowSurface) {
+                    if (isResize)
+                        bs->windowSurface->resize(r.size());
+                }
+
+                if (needsShow)
+                    show_sys();
             } else {
-                QPoint posInNativeParent =  q->mapTo(q->nativeParentWidget(),QPoint());
-                q->windowHandle()->setGeometry(QRect(posInNativeParent,r.size()));
+                if (isMove && !isResize)
+                    moveRect(QRect(oldPos, olds), x - oldPos.x(), y - oldPos.y());
+                else
+                    invalidateBuffer_resizeHelper(oldPos, olds);
             }
-            const QWidgetBackingStore *bs = maybeBackingStore();
-            if (bs->windowSurface) {
-                if (isResize)
-                    bs->windowSurface->resize(r.size());
-            }
-        } else {
-            if (isMove && !isResize)
-                moveRect(QRect(oldPos, olds), x - oldPos.x(), y - oldPos.y());
-            else
-                invalidateBuffer_resizeHelper(oldPos, olds);
         }
 
         if (isMove) {
diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
index 786293a716..27f9c9e2f8 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa.cpp
+++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp
@@ -266,9 +266,20 @@ void QWidgetWindow::handleKeyEvent(QKeyEvent *event)
     QGuiApplication::sendSpontaneousEvent(widget, event);
 }
 
+void QWidgetWindow::updateGeometry()
+{
+    if (m_widget->testAttribute(Qt::WA_OutsideWSRange))
+        return;
+
+    QMargins margins = frameMargins();
+
+    m_widget->data->crect = geometry().translated(-margins.left(), -margins.top());
+    m_widget->d_func()->topData()->frameStrut.setCoords(margins.left(), margins.top(), margins.right(), margins.bottom());
+}
+
 void QWidgetWindow::handleMoveEvent(QMoveEvent *event)
 {
-    m_widget->data->crect = geometry();
+    updateGeometry();
     QGuiApplication::sendSpontaneousEvent(m_widget, event);
 }
 
@@ -276,7 +287,7 @@ void QWidgetWindow::handleResizeEvent(QResizeEvent *event)
 {
     QSize oldSize = m_widget->data->crect.size();
 
-    m_widget->data->crect = geometry();
+    updateGeometry();
     QGuiApplication::sendSpontaneousEvent(m_widget, event);
 
     if (m_widget->d_func()->paintOnScreen()) {
diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h
index a217a969ca..f200839b0b 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa_p.h
+++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h
@@ -78,6 +78,8 @@ protected:
     void handleExposeEvent(QExposeEvent *);
 
 private:
+    void updateGeometry();
+
     QWidget *m_widget;
     QWeakPointer<QWidget> m_implicit_mouse_grabber;
     QWeakPointer<QWidget> m_dragTarget;