Improved resize behavior when clicking on columns in debugger.

3 files changed, 15 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f849c73f785..ca19507b9b4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -43,7 +43,7 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
-	sha256sums = 67835ac127ec440c1bf227f9ecc1ffb3a0c4ce2c89213a09af5cf13b99b773cf
+	sha256sums = cf378a8b591a10646ad89d101375d8b04844c76a83d6c9c960036ba6a3b122e3
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index 5fa286183d9f..622022534bee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,7 +46,7 @@ sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
-			'67835ac127ec440c1bf227f9ecc1ffb3a0c4ce2c89213a09af5cf13b99b773cf')
+			'cf378a8b591a10646ad89d101375d8b04844c76a83d6c9c960036ba6a3b122e3')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-debugger-columns-fix.patch b/qtcreator-debugger-columns-fix.patch
index 41e14348e7fc..4f4a632d7ea3 100644
--- a/qtcreator-debugger-columns-fix.patch
+++ b/qtcreator-debugger-columns-fix.patch
@@ -1,5 +1,5 @@
 diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
-index bae4c16fef..227d137766 100644
+index bae4c16fef..3fc12130b7 100644
 --- a/src/libs/utils/basetreeview.cpp
 +++ b/src/libs/utils/basetreeview.cpp
 @@ -55,6 +55,42 @@ public:
@@ -63,11 +63,19 @@ index bae4c16fef..227d137766 100644
      void toggleColumnWidth(int logicalIndex)
      {
          QHeaderView *h = q->header();
-@@ -212,10 +259,64 @@ public:
+@@ -211,11 +258,72 @@ public:
+             int minSize = 10 * fm.width(QLatin1Char('x'));
              targetSize = qMax(minSize, headerSize);
          }
++
++        // Prevent rebalance as part of this resize.
++        m_processingSpans = true;
          h->resizeSection(logicalIndex, targetSize);
++        m_processingSpans = false;
++
++        // Now trigger a rebalance so it resizes the span column. (if set)
 +        rebalanceColumns();
++
          m_userHandled.remove(logicalIndex); // Reset.
          saveState();
      }
@@ -128,7 +136,7 @@ index bae4c16fef..227d137766 100644
  public:
      BaseTreeView *q;
      QMap<int, int> m_userHandled; // column -> width, "not present" means "automatic"
-@@ -224,6 +325,8 @@ public:
+@@ -224,6 +332,8 @@ public:
      QString m_settingsKey;
      bool m_expectUserChanges = false;
      ProgressIndicator *m_progressIndicator = nullptr;
@@ -137,7 +145,7 @@ index bae4c16fef..227d137766 100644
  };
  
  class BaseTreeViewDelegate : public QItemDelegate
-@@ -369,6 +472,12 @@ void BaseTreeView::mouseDoubleClickEvent(QMouseEvent *ev)
+@@ -369,6 +479,12 @@ void BaseTreeView::mouseDoubleClickEvent(QMouseEvent *ev)
          TreeView::mouseDoubleClickEvent(ev);
  }
  
@@ -150,7 +158,7 @@ index bae4c16fef..227d137766 100644
  void BaseTreeView::showEvent(QShowEvent *ev)
  {
      emit aboutToShow();
-@@ -416,6 +525,21 @@ void BaseTreeView::resizeColumns()
+@@ -416,6 +532,21 @@ void BaseTreeView::resizeColumns()
      d->resizeColumns();
  }