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

Fix tab indicator width

Browse Source
This commit is contained in:
Florian Bruhin 2017-06-13 14:54:22 +02:00
parent 269e9d69e0
commit fcc0b3e8c0
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qutebrowser/mainwindow/tabwidget.py
View File

@ -466,10 +466,9 @@ class TabBar(QTabBar):
icon_size = icon.actualSize(QSize(extent, extent)) icon_size = icon.actualSize(QSize(extent, extent))
padding_h += self.style().pixelMetric( padding_h += self.style().pixelMetric(
PixelMetrics.icon_padding, None, self) PixelMetrics.icon_padding, None, self)
indicator_width = config.val.tabs.indicator_width
height = self.fontMetrics().height() + padding_v height = self.fontMetrics().height() + padding_v
width = (self.fontMetrics().width('\u2026') + icon_size.width() + width = (self.fontMetrics().width('\u2026') + icon_size.width() +
padding_h + indicator_width) padding_h + config.val.tabs.width.indicator)
return QSize(width, height) return QSize(width, height)
def tabSizeHint(self, index): def tabSizeHint(self, index):
@ -505,19 +504,30 @@ class TabBar(QTabBar):
# get scroll buttons as soon as needed. # get scroll buttons as soon as needed.
size = minimum_size size = minimum_size
else: else:
tab_width_pinned_conf = config.val.tabs.pinned_width
try: try:
pinned = self.tab_data(index, 'pinned') pinned = self.tab_data(index, 'pinned')
except KeyError: except KeyError:
pinned = False pinned = False
no_pinned_count = self.count() - self.pinned_count no_pinned_count = self.count() - self.pinned_count
pinned_width = tab_width_pinned_conf * self.pinned_count pinned_width = config.val.tabs.width.pinned * self.pinned_count
no_pinned_width = self.width() - pinned_width no_pinned_width = self.width() - pinned_width
if pinned: if pinned:
width = tab_width_pinned_conf size = QSize(config.val.tabs.width.pinned, height)
qtutils.ensure_valid(size)
return size
# If we *do* have enough space, tabs should 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 self.pinned_count > 0 and self.count() > self.pinned_count:
pinned_width = config.val.tabs.width.pinned * self.pinned_count
no_pinned_width = self.width() - pinned_width
width = no_pinned_width / (self.count() - self.pinned_count)
else: else:
# If we *do* have enough space, tabs should occupy the whole # If we *do* have enough space, tabs should occupy the whole
@ -785,7 +795,7 @@ class TabBarStyle(QCommonStyle):
text_rect.adjust(padding.left, padding.top, -padding.right, text_rect.adjust(padding.left, padding.top, -padding.right,
-padding.bottom) -padding.bottom)
indicator_width = config.val.tabs.indicator_width indicator_width = config.val.tabs.width.indicator
if indicator_width == 0: if indicator_width == 0:
indicator_rect = QRect() indicator_rect = QRect()
else: else: