diff options
| author | Jay Kamat <jaygkamat@gmail.com> | 2017-11-05 23:23:33 -0500 |
|---|---|---|
| committer | Jay Kamat <jaygkamat@gmail.com> | 2017-11-05 23:23:33 -0500 |
| commit | ca0aa68f7412b68cef0bc840dfa1e570ed4261e4 (patch) | |
| tree | 04c075eb320526dfaaccd79a5614852389138100 | |
| parent | f6b6b2ed7dac341adaac451c3bac46407c101502 (diff) | |
| download | qutebrowser-ca0aa68f7412b68cef0bc840dfa1e570ed4261e4.tar.gz qutebrowser-ca0aa68f7412b68cef0bc840dfa1e570ed4261e4.zip | |
Fix icon width calculation for pinned tabs
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | qutebrowser/mainwindow/tabwidget.py | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 429c01961..cb244557b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ __pycache__ /.cache /.testmondata /.hypothesis +/.mypy_cache /prof /venv TODO diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py index 5af709c85..ddd7424c6 100644 --- a/qutebrowser/mainwindow/tabwidget.py +++ b/qutebrowser/mainwindow/tabwidget.py @@ -431,6 +431,8 @@ class TabBar(QTabBar): """Set the tab bar font.""" self.setFont(config.val.fonts.tabs) self._set_icon_size() + # clear tab size cache + self._minimum_tab_size_hint_helper.cache_clear() def _set_icon_size(self): """Set the tab bar favicon size.""" @@ -477,11 +479,13 @@ class TabBar(QTabBar): A QSize of the smallest tab size we can make. """ icon = self.tabIcon(index) - extent = self.style().pixelMetric(QStyle.PM_TabBarIconSize, None, self) + icon_padding = self.style().pixelMetric(PixelMetrics.icon_padding, + None, self) if icon.isNull(): icon_width = 0 else: - icon_width = icon.actualSize(QSize(extent, extent)).width() + icon_width = min(icon.actualSize(self.iconSize()).width(), + self.iconSize().width()) + icon_padding return self._minimum_tab_size_hint_helper(self.tabText(index), icon_width, ellipsis) @@ -500,13 +504,16 @@ class TabBar(QTabBar): text_width = min(self.fontMetrics().width(text), self.fontMetrics().width(tab_text)) padding = config.val.tabs.padding + indicator_width = config.val.tabs.width.indicator indicator_padding = config.val.tabs.indicator_padding padding_h = padding.left + padding.right - padding_h += indicator_padding.left + indicator_padding.right + # Only add padding if indicator exists + if indicator_width != 0: + padding_h += indicator_padding.left + indicator_padding.right padding_v = padding.top + padding.bottom height = self.fontMetrics().height() + padding_v width = (text_width + icon_width + - padding_h + config.val.tabs.width.indicator) + padding_h + indicator_width) return QSize(width, height) def _pinned_statistics(self) -> (int, int): |