From 31c6bee4d5f314e184fc64a6a655fcfa1ea3fb60 Mon Sep 17 00:00:00 2001
From: Karim Pinter <karim.pinter@theqtcompany.com>
Date: Tue, 5 Apr 2016 11:45:43 +0300
Subject: Removes spacing when widget is hidden in QGridLayout

Removes spacing in QGridLayout when the QWidgets inside of the QGridLayout
are hidden, by checking if the sibling is empty, thus duplicate
spacing can be avoided.

Task-number: QTBUG-52357
Change-Id: I45475e7b264f94ef3bec5f9a4b8cbaa1d53ec6dd
Reviewed-by: Karim Pinter <karim.pinter@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
---
 src/widgets/kernel/qgridlayout.cpp                  | 10 +++++++---
 .../widgets/kernel/qgridlayout/tst_qgridlayout.cpp  | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp
index b58e7fdc9e..29df38f19c 100644
--- a/src/widgets/kernel/qgridlayout.cpp
+++ b/src/widgets/kernel/qgridlayout.cpp
@@ -746,9 +746,13 @@ void QGridLayoutPrivate::setupSpacings(QVector<QLayoutStruct> &chain,
                     if (orientation == Qt::Vertical) {
                         QGridBox *sibling = vReversed ? previousBox : box;
                         if (sibling) {
-                            QWidget *wid = sibling->item()->widget();
-                            if (wid)
-                                spacing = qMax(spacing, sibling->item()->geometry().top() - wid->geometry().top() );
+                            if (sibling->item()->isEmpty()) {
+                                spacing = 0;
+                            } else {
+                                QWidget *wid = sibling->item()->widget();
+                                if (wid)
+                                    spacing = qMax(spacing, sibling->item()->geometry().top() - wid->geometry().top());
+                            }
                         }
                     }
                 }
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index f3436ca1be..3c4c1a1d41 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -80,6 +80,7 @@ private slots:
     void taskQTBUG_27420_takeAtShouldUnparentLayout();
     void taskQTBUG_40609_addingWidgetToItsOwnLayout();
     void taskQTBUG_40609_addingLayoutToItself();
+    void taskQTBUG_52357_spacingWhenItemIsHidden();
     void replaceWidget();
     void dontCrashWhenExtendsToEnd();
 };
@@ -1650,6 +1651,26 @@ void tst_QGridLayout::taskQTBUG_40609_addingLayoutToItself(){
     QCOMPARE(layout.count(), 0);
 }
 
+void tst_QGridLayout::taskQTBUG_52357_spacingWhenItemIsHidden()
+{
+    QWidget widget;
+    setFrameless(&widget);
+    QGridLayout layout(&widget);
+    layout.setMargin(0);
+    layout.setSpacing(5);
+    QPushButton button1;
+    layout.addWidget(&button1, 0, 0);
+    QPushButton button2;
+    layout.addWidget(&button2, 0, 1);
+    QPushButton button3;
+    layout.addWidget(&button3, 0, 2);
+    widget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&widget));
+    int tempWidth = button1.width() + button2.width() + button3.width() + 2 * layout.spacing();
+    button2.hide();
+    QTRY_COMPARE_WITH_TIMEOUT(tempWidth, button1.width() + button3.width() + layout.spacing(), 1000);
+}
+
 void tst_QGridLayout::replaceWidget()
 {
     QWidget wdg;
-- 
cgit v1.2.3