From e49aa35c752ec9408ad7fde6db6a81564edd5175 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 4 Aug 2017 20:20:54 -0700
Subject: [PATCH] Remove pinned_width variables

Now it calculates the number of pinned tabs directly, instead of
keeping track of a variable. Potentially slower though.
---
 qutebrowser/mainwindow/tabbedbrowser.py |  4 ----
 qutebrowser/mainwindow/tabwidget.py     | 30 ++++++-------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index 13865ba90..7234b13b4 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -272,10 +272,6 @@ class TabbedBrowser(tabwidget.TabWidget):
         if last_close == 'ignore' and count == 1:
             return
 
-        # If we are removing a pinned tab, decrease count
-        if tab.data.pinned:
-            self.tabBar().pinned_count -= 1
-
         self._remove_tab(tab, add_undo=add_undo)
 
         if count == 1:  # We just closed the last tab above.
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index c1d2ec82c..c4686ddc1 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -104,14 +104,6 @@ class TabWidget(QTabWidget):
         bar = self.tabBar()
         idx = self.indexOf(tab)
 
-        # Only modify pinned_count if we had a change
-        # always modify pinned_count if we are loading
-        if tab.data.pinned != pinned or loading:
-            if pinned:
-                bar.pinned_count += 1
-            elif not pinned:
-                bar.pinned_count -= 1
-
         bar.set_tab_data(idx, 'pinned', pinned)
         tab.data.pinned = pinned
         self._update_tab_title(idx)
@@ -310,7 +302,6 @@ class TabBar(QTabBar):
         self._on_show_switching_delay_changed()
         self.setAutoFillBackground(True)
         self._set_colors()
-        self.pinned_count = 0
         QTimer.singleShot(0, self.maybe_hide)
 
     def __repr__(self):
@@ -475,7 +466,11 @@ class TabBar(QTabBar):
                     # Get only pinned tabs (from indexes)
                     filter(self._tabPinned, range(self.count())))))
 
-    def _tabPinned(self, index: int):
+    def _pinnedCount(self) -> int:
+        """Get the number of pinned tabs."""
+        return len(list(filter(self._tabPinned, range(self.count()))))
+
+    def _tabPinned(self, index: int) -> bool:
         """Return True if tab is pinned."""
         try:
             return self.tab_data(index, 'pinned')
@@ -512,7 +507,7 @@ class TabBar(QTabBar):
             return QSize()
         else:
             pinned = self._tabPinned(index)
-            no_pinned_count = self.count() - self.pinned_count
+            no_pinned_count = self.count() - self._pinnedCount()
             pinned_width = self._tabTotalWidthPinned()
             no_pinned_width = self.width() - pinned_width
 
@@ -521,18 +516,7 @@ class TabBar(QTabBar):
                 # titles, let QT handle scaling it down if we get too small.
                 width = self.minimumTabSizeHint(index, elipsis=False).width()
             else:
-
-                # Tabs should attempt to occupy the whole window width. If
-                # there are pinned tabs their size will be subtracted from the
-                # total window width.  During shutdown the self.count goes
-                # down, but the self.pinned_count not - this generates some odd
-                # behavior. To avoid this we compare self.count against
-                # self.pinned_count. If we end up having too little space, we
-                # set the minimum size below.
-                if self.pinned_count > 0 and no_pinned_count > 0:
-                    width = no_pinned_width / no_pinned_count
-                else:
-                    width = self.width() / self.count()
+                width = no_pinned_width / no_pinned_count
 
             # If no_pinned_width is not divisible by no_pinned_count, add a
             # pixel to some tabs so that there is no ugly leftover space.