Updated selection fix and debugger column size patches.

4 files changed, 67 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04e911092671..8611c18bbd72 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qtcreator-fixed-themes
 	pkgdesc = Lightweight, cross-platform integrated development environment, with fixes applied for various themes
 	pkgver = 4.8.0
-	pkgrel = 8
+	pkgrel = 9
 	url = http://qt-project.org
 	arch = x86_64
 	license = LGPL
@@ -39,11 +39,11 @@ pkgbase = qtcreator-fixed-themes
 	sha256sums = aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43
 	sha256sums = 6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6
 	sha256sums = 9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681
-	sha256sums = 6fa5ca49df0b4a79e25a812e21f6f378ee3cd3f6d1f8a2cb4e10ea8b60b0f007
+	sha256sums = 0a605a363a23f6baf5543ea5e27ecfd87f1072322f3a455d3ce15effcf668be4
 	sha256sums = f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d
 	sha256sums = ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b
 	sha256sums = 12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f
-	sha256sums = e22bf0c3c18832c014adc5d07f09ce962c4515d40b68ad115b4991f14522be07
+	sha256sums = 67835ac127ec440c1bf227f9ecc1ffb3a0c4ce2c89213a09af5cf13b99b773cf
 
 pkgname = qtcreator-fixed-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index a2fd4f53ed2c..35281d9fc3b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=qtcreator-fixed-themes
 pkgver=4.8.0
 _clangver=7.0.1
-pkgrel=8
+pkgrel=9
 pkgdesc='Lightweight, cross-platform integrated development environment, with fixes applied for various themes'
 arch=(x86_64)
 url='http://qt-project.org'
@@ -42,11 +42,11 @@ source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/
 sha256sums=('aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43'
             '6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6'
             '9cd55729e76505ef35fe3059ddbaa86b1071f9f0075b4313f3ccbb8593094681'
-            '6fa5ca49df0b4a79e25a812e21f6f378ee3cd3f6d1f8a2cb4e10ea8b60b0f007'
+            '0a605a363a23f6baf5543ea5e27ecfd87f1072322f3a455d3ce15effcf668be4'
 			'f938a72cc79c9ed8de07da8af79b170f67448a74dbd3228dd3de7e4855ed633d'
 			'ba6a48156cc14935a0dea12e8282bdfb1936e0c67216c660eef41bd5b5a44d4b'
 			'12dad35519cfc62119b0af21b31a96149081ae1ee6d6e7cb65ee80f3774ff06f'
-			'e22bf0c3c18832c014adc5d07f09ce962c4515d40b68ad115b4991f14522be07')
+			'67835ac127ec440c1bf227f9ecc1ffb3a0c4ce2c89213a09af5cf13b99b773cf')
 
 prepare() {
   mkdir -p build
diff --git a/qtcreator-dark-and-flat-selection-fixes.patch b/qtcreator-dark-and-flat-selection-fixes.patch
index c32565fd0331..02e7cc9d318d 100644
--- a/qtcreator-dark-and-flat-selection-fixes.patch
+++ b/qtcreator-dark-and-flat-selection-fixes.patch
@@ -21,7 +21,7 @@ index 5da67fa236..6b1f2fba96 100644
  PaletteDark=shadowBackground
  PaletteHighlightedText=textHighlighted
 diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
-index e73d10b0ff..3faa2223a1 100644
+index e73d10b0ff..a4f263c1f7 100644
 --- a/share/qtcreator/themes/flat-dark.creatortheme
 +++ b/share/qtcreator/themes/flat-dark.creatortheme
 @@ -13,7 +13,7 @@ toolBarItemDisabled=60a4a6a8
@@ -29,7 +29,7 @@ index e73d10b0ff..3faa2223a1 100644
  fancyBarsBoldTextColor=b6fbfdff
  hoverBackground=22ffffff
 -selectedBackground=66000000
-+selectedBackground=ff1d545c
++selectedBackground=aa1d545c
  selectedBackgroundText=ff1d545c
  normalBackground=ff2E2F30
  alternateBackground=ff353637
diff --git a/qtcreator-debugger-columns-fix.patch b/qtcreator-debugger-columns-fix.patch
index 7f303da731fe..41e14348e7fc 100644
--- a/qtcreator-debugger-columns-fix.patch
+++ b/qtcreator-debugger-columns-fix.patch
@@ -1,29 +1,43 @@
 diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp
-index bae4c16fef..a1ccafd816 100644
+index bae4c16fef..227d137766 100644
 --- a/src/libs/utils/basetreeview.cpp
 +++ b/src/libs/utils/basetreeview.cpp
-@@ -55,6 +55,28 @@ public:
+@@ -55,6 +55,42 @@ public:
          m_settingsTimer.setSingleShot(true);
          connect(&m_settingsTimer, &QTimer::timeout,
                  this, &BaseTreeViewPrivate::doSaveState);
 +        connect(q->header(), &QHeaderView::sectionResized, this, [this](int logicalIndex, int oldSize, int newSize) {
++            if (m_processingSpans || m_spanColumn < 0)
++                return;
++
 +            QHeaderView *h = q->header();
 +            QTC_ASSERT(h, return);
 +
-+            int column;
-+            if (oldSize < newSize && logicalIndex + 1 < h->count() &&
-+                    h->sectionSize(logicalIndex + 1) == h->minimumSectionSize()) {
++            // Last non-hidden column.
++            int count = h->count();
++            while (count > 0 && h->isSectionHidden(count - 1))
++                --count;
++
++            if (count == 0)
++                return;
++
++            int column = logicalIndex;
++            if (oldSize < newSize)
++            {
 +                // Protect against sizing past the next section.
-+                column = logicalIndex;
-+            } else if (logicalIndex >= m_spanColumn) {
-+                // Resize after the span column.zzz
-+                column = logicalIndex + 1;
++                while (column + 1 < count && h->sectionSize(column + 1) == h->minimumSectionSize())
++                    ++column;
++            }
++
++            if (logicalIndex >= m_spanColumn) {
++                // Resize after the span column.
++                column = column + 1;
 +            } else {
 +                // Resize the span column or before it.
 +                column = m_spanColumn;
 +            }
 +
-+            rebalanceColumns(column);
++            rebalanceColumns(column, false);
 +        });
 +        connect(q->header(), &QHeaderView::geometriesChanged, this, [this]() {
 +            rebalanceColumns();
@@ -31,7 +45,7 @@ index bae4c16fef..a1ccafd816 100644
      }
  
      bool eventFilter(QObject *, QEvent *event) override
-@@ -197,6 +219,17 @@ public:
+@@ -197,6 +233,17 @@ public:
          }
      }
  
@@ -49,7 +63,7 @@ index bae4c16fef..a1ccafd816 100644
      void toggleColumnWidth(int logicalIndex)
      {
          QHeaderView *h = q->header();
-@@ -212,10 +245,65 @@ public:
+@@ -212,10 +259,64 @@ public:
              targetSize = qMax(minSize, headerSize);
          }
          h->resizeSection(logicalIndex, targetSize);
@@ -60,10 +74,10 @@ index bae4c16fef..a1ccafd816 100644
  
 +    void rebalanceColumns()
 +    {
-+        rebalanceColumns(m_spanColumn);
++        rebalanceColumns(m_spanColumn, true);
 +    }
 +
-+    void rebalanceColumns(int column)
++    void rebalanceColumns(int column, bool allowResizePrevious)
 +    {
 +        if (m_spanColumn < 0 || column < 0 || m_processingSpans)
 +            return;
@@ -76,17 +90,17 @@ index bae4c16fef..a1ccafd816 100644
 +            return;
 +
 +        // Start with the target column, and resize other columns as necessary.
-+        for (int i = column; i < count; ++i) {
-+            if (tryRebalanceColumns(i))
-+                return;
-+        }
-+        for (int i = column - 1; i >= 0; --i) {
-+            if (tryRebalanceColumns(i))
++        int totalSize = q->viewport()->width();
++        if (tryRebalanceColumns(column, totalSize))
++            return;
++
++        for (int i = allowResizePrevious ? 0 : column + 1; i < count; ++i) {
++            if (i != column && tryRebalanceColumns(i, totalSize))
 +                return;
 +        }
 +    }
 +
-+    bool tryRebalanceColumns(int column)
++    bool tryRebalanceColumns(int column, int totalSize)
 +    {
 +        QHeaderView *h = q->header();
 +
@@ -97,7 +111,6 @@ index bae4c16fef..a1ccafd816 100644
 +                otherColumnTotal += h->sectionSize(i);
 +        }
 +
-+        int totalSize = h->width();
 +        if (otherColumnTotal < totalSize) {
 +            m_processingSpans = true;
 +            h->resizeSection(column, totalSize - otherColumnTotal);
@@ -109,13 +122,13 @@ index bae4c16fef..a1ccafd816 100644
 +        int totalColumnSize = 0;
 +        for (int i = 0; i < count; ++i)
 +            totalColumnSize += h->sectionSize(i);
-+        return totalColumnSize != totalSize;
++        return totalColumnSize == totalSize;
 +    }
 +
  public:
      BaseTreeView *q;
      QMap<int, int> m_userHandled; // column -> width, "not present" means "automatic"
-@@ -224,6 +312,8 @@ public:
+@@ -224,6 +325,8 @@ public:
      QString m_settingsKey;
      bool m_expectUserChanges = false;
      ProgressIndicator *m_progressIndicator = nullptr;
@@ -124,7 +137,20 @@ index bae4c16fef..a1ccafd816 100644
  };
  
  class BaseTreeViewDelegate : public QItemDelegate
-@@ -416,6 +506,21 @@ void BaseTreeView::resizeColumns()
+@@ -369,6 +472,12 @@ void BaseTreeView::mouseDoubleClickEvent(QMouseEvent *ev)
+         TreeView::mouseDoubleClickEvent(ev);
+ }
+ 
++void BaseTreeView::resizeEvent(QResizeEvent *ev)
++{
++    TreeView::resizeEvent(ev);
++    d->rebalanceColumns();
++}
++
+ void BaseTreeView::showEvent(QShowEvent *ev)
+ {
+     emit aboutToShow();
+@@ -416,6 +525,21 @@ void BaseTreeView::resizeColumns()
      d->resizeColumns();
  }
  
@@ -147,10 +173,16 @@ index bae4c16fef..a1ccafd816 100644
  {
      QTC_ASSERT(!d->m_settings, qDebug() << "DUPLICATED setSettings" << key);
 diff --git a/src/libs/utils/basetreeview.h b/src/libs/utils/basetreeview.h
-index 923c69b042..8ea6659c0c 100644
+index 923c69b042..36da658913 100644
 --- a/src/libs/utils/basetreeview.h
 +++ b/src/libs/utils/basetreeview.h
-@@ -73,6 +73,13 @@ public:
+@@ -68,11 +68,19 @@ public:
+     void dropEvent(QDropEvent *ev) override;
+     void dragMoveEvent(QDragMoveEvent *ev) override;
+     void mouseDoubleClickEvent(QMouseEvent *ev) override;
++    void resizeEvent(QResizeEvent *event) override;
+ 
+     void showProgressIndicator();
      void hideProgressIndicator();
      void resizeColumns();