From 53c4b36e4a5ef9abf000a294bf8c6f6d807e27c8 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 23 Jun 2016 15:55:36 +0300
Subject: [PATCH] Git: Resize columns in branches dialog when data is changed

When setting a tracking branch, creating or deleting a branch.

Change-Id: I58dd06912fbf23900674a8714224ee414f1da4b7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/git/branchdialog.cpp | 12 ++++++++++--
 src/plugins/git/branchdialog.h   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp
index f26dda60fd1..502d3afc4e7 100644
--- a/src/plugins/git/branchdialog.cpp
+++ b/src/plugins/git/branchdialog.cpp
@@ -88,6 +88,9 @@ BranchDialog::BranchDialog(QWidget *parent) :
 
     connect(m_ui->branchView->selectionModel(), &QItemSelectionModel::selectionChanged,
             this, &BranchDialog::enableButtons);
+    connect(m_model, &QAbstractItemModel::dataChanged, this, &BranchDialog::resizeColumns);
+    connect(m_model, &QAbstractItemModel::rowsInserted, this, &BranchDialog::resizeColumns);
+    connect(m_model, &QAbstractItemModel::rowsRemoved, this, &BranchDialog::resizeColumns);
 
     enableButtons();
 }
@@ -109,8 +112,7 @@ void BranchDialog::refresh(const QString &repository, bool force)
         VcsOutputWindow::appendError(errorMessage);
 
     m_ui->branchView->expandAll();
-    m_ui->branchView->resizeColumnToContents(0);
-    m_ui->branchView->resizeColumnToContents(1);
+    resizeColumns();
 }
 
 void BranchDialog::refreshIfSame(const QString &repository)
@@ -119,6 +121,12 @@ void BranchDialog::refreshIfSame(const QString &repository)
         refreshCurrentRepository();
 }
 
+void BranchDialog::resizeColumns()
+{
+    m_ui->branchView->resizeColumnToContents(0);
+    m_ui->branchView->resizeColumnToContents(1);
+}
+
 void BranchDialog::enableButtons()
 {
     QModelIndex idx = selectedIndex();
diff --git a/src/plugins/git/branchdialog.h b/src/plugins/git/branchdialog.h
index 0bb45a221a7..db0318b5570 100644
--- a/src/plugins/git/branchdialog.h
+++ b/src/plugins/git/branchdialog.h
@@ -52,11 +52,11 @@ public:
     explicit BranchDialog(QWidget *parent = 0);
     ~BranchDialog() override;
 
-public slots:
     void refresh(const QString &repository, bool force);
     void refreshIfSame(const QString &repository);
 
 private:
+    void resizeColumns();
     void enableButtons();
     void refreshCurrentRepository();
     void add();