From bb57fe7440e59008851a95ee63ee4d16fde080ed Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 16 Oct 2019 11:02:24 +0200
Subject: Qt Designer: Adapt signal slot editor column widths

Resize the columns when adding new connections (with potentially
long object names) or when loading a form.

Fixes: QTBUG-79266
Change-Id: I47e8fe8e8139e5326e07aece5e0f2406ac6117e6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .../components/signalsloteditor/signalsloteditorwindow.cpp    | 11 +++++++++++
 .../src/components/signalsloteditor/signalsloteditorwindow.h  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index f8651877f..c2f53a46e 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -734,6 +734,8 @@ void SignalSlotEditorWindow::setActiveFormWindow(QDesignerFormWindowInterface *f
                     this, &SignalSlotEditorWindow::updateEditorSelection);
         disconnect(m_editor.data(), &SignalSlotEditor::connectionSelected,
                    this, &SignalSlotEditorWindow::updateDialogSelection);
+        disconnect(m_editor.data(), &SignalSlotEditor::connectionAdded,
+                   this, &SignalSlotEditorWindow::resizeColumns);
         if (integration) {
             disconnect(integration, &QDesignerIntegrationInterface::objectNameChanged,
                        this, &SignalSlotEditorWindow::objectNameChanged);
@@ -753,12 +755,15 @@ void SignalSlotEditorWindow::setActiveFormWindow(QDesignerFormWindowInterface *f
                 this, &SignalSlotEditorWindow::updateEditorSelection);
         connect(m_editor.data(), &SignalSlotEditor::connectionSelected,
                 this, &SignalSlotEditorWindow::updateDialogSelection);
+        connect(m_editor.data(), &SignalSlotEditor::connectionAdded,
+                this, &SignalSlotEditorWindow::resizeColumns);
         if (integration) {
             connect(integration, &QDesignerIntegrationInterface::objectNameChanged,
                     this, &SignalSlotEditorWindow::objectNameChanged);
         }
     }
 
+    resizeColumns();
     updateUi();
 }
 
@@ -826,6 +831,12 @@ void SignalSlotEditorWindow::updateUi()
     m_remove_button->setEnabled(!m_editor.isNull() && m_view->currentIndex().isValid());
 }
 
+void SignalSlotEditorWindow::resizeColumns()
+{
+    for (int c = 0, count = m_model->columnCount(); c < count; ++c)
+        m_view->resizeColumnToContents(c);
+}
+
 } // namespace qdesigner_internal
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
index 8a51a8ca0..4d7af91f8 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
@@ -65,6 +65,7 @@ private slots:
     void addConnection();
     void removeConnection();
     void updateUi();
+    void resizeColumns();
 
 private:
     QTreeView *m_view;
-- 
cgit v1.2.3