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

Add indicator padding to minimumTabSizeHint

Browse Source 
Previously, indicator_padding was not taken into account, causing
problems when using a indicator_padding too small

Also removed icon padding to width calculation (seemed to be overestimating)
This commit is contained in:
Jay Kamat 2017-09-27 19:33:59 -04:00
parent cc84c1722d
commit bb8d41cedc
No known key found for this signature in database
GPG Key ID: 5D2E399600F4F7B5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/mainwindow/tabwidget.py
View File

@ -435,9 +435,14 @@ class TabBar(QTabBar):
A QSize of the smallest tab size we can make. A QSize of the smallest tab size we can make.
""" """
text = '\u2026' if ellipsis else self.tabText(index) text = '\u2026' if ellipsis else self.tabText(index)
# Don't ever shorten if text is shorter than the elipsis
text_width = min(self.fontMetrics().width(text),
self.fontMetrics().width(self.tabText(index)))
icon = self.tabIcon(index) icon = self.tabIcon(index)
padding = config.val.tabs.padding padding = config.val.tabs.padding
indicator_padding = config.val.tabs.indicator_padding
padding_h = padding.left + padding.right padding_h = padding.left + 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(): if icon.isNull():
icon_size = QSize(0, 0) icon_size = QSize(0, 0)
@ -445,10 +450,8 @@ class TabBar(QTabBar):
extent = self.style().pixelMetric(QStyle.PM_TabBarIconSize, None, extent = self.style().pixelMetric(QStyle.PM_TabBarIconSize, None,
self) self)
icon_size = icon.actualSize(QSize(extent, extent)) icon_size = icon.actualSize(QSize(extent, extent))
padding_h += self.style().pixelMetric(
PixelMetrics.icon_padding, None, self)
height = self.fontMetrics().height() + padding_v height = self.fontMetrics().height() + padding_v
width = (self.fontMetrics().width(text) + icon_size.width() + width = (text_width + icon_size.width() +
padding_h + config.val.tabs.width.indicator) padding_h + config.val.tabs.width.indicator)
return QSize(width, height) return QSize(width, height)