rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix blowing cache for different icons

Browse Source
This commit is contained in:
Jay Kamat 2017-10-20 21:50:35 -04:00
parent fde4495bc7
commit caae1c7008
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qutebrowser/mainwindow/tabwidget.py
View File

@ -453,20 +453,25 @@ class TabBar(QTabBar):
Return: Return:
A QSize of the smallest tab size we can make. A QSize of the smallest tab size we can make.
""" """
icon = self.tabIcon(index)
extent = self.style().pixelMetric(QStyle.PM_TabBarIconSize, None, self)
if not icon:
icon_width = 0
else:
icon_width = icon.actualSize(QSize(extent, extent)).width()
return self._minimum_tab_size_hint_helper(self.tabText(index), return self._minimum_tab_size_hint_helper(self.tabText(index),
self.tabIcon(index), icon_width,
ellipsis) ellipsis)
@functools.lru_cache(maxsize=100) @functools.lru_cache(maxsize=2**10)
def _minimum_tab_size_hint_helper(self, tab_text: str, def _minimum_tab_size_hint_helper(self, tab_text: str,
icon, icon_width: int,
ellipsis: bool) -> QSize: ellipsis: bool) -> QSize:
"""Helper function to cache tab results. """Helper function to cache tab results.
Acessing config values in here should be added to _on_config_changed to Acessing config values in here should be added to _on_config_changed to
ensure cache is flushed when needed. ensure cache is flushed when needed.
""" """
print("running!")
text = '\u2026' if ellipsis else tab_text text = '\u2026' if ellipsis else tab_text
# Don't ever shorten if text is shorter than the ellipsis # Don't ever shorten if text is shorter than the ellipsis
text_width = min(self.fontMetrics().width(text), text_width = min(self.fontMetrics().width(text),
@ -476,14 +481,8 @@ class TabBar(QTabBar):
padding_h = padding.left + padding.right padding_h = padding.left + padding.right
padding_h += indicator_padding.left + indicator_padding.right padding_h += indicator_padding.left + indicator_padding.right
padding_v = padding.top + padding.bottom padding_v = padding.top + padding.bottom
if icon.isNull():
icon_size = QSize(0, 0)
else:
extent = self.style().pixelMetric(QStyle.PM_TabBarIconSize, None,
self)
icon_size = icon.actualSize(QSize(extent, extent))
height = self.fontMetrics().height() + padding_v height = self.fontMetrics().height() + padding_v
width = (text_width + icon_size.width() + width = (text_width + icon_width +
padding_h + config.val.tabs.width.indicator) padding_h + config.val.tabs.width.indicator)
return QSize(width, height) return QSize(width, height)