Merge remote-tracking branch 'origin/pr/3266'

This commit is contained in:
Florian Bruhin 2017-11-13 07:09:49 +01:00
commit 7f0ecaa89e
2 changed files with 11 additions and 2 deletions

View File

@ -1353,6 +1353,11 @@ tabs.indicator.padding:
tabs.width.pinned:
deleted: true
tabs.pinned.shrink:
default: true
type: Bool
desc: Shrink pinned tabs down to their contents.
tabs.wrap:
default: true
type: Bool

View File

@ -565,8 +565,12 @@ class TabBar(QTabBar):
# want to ensure it's valid in this special case.
return QSize()
else:
pinned = self._tab_pinned(index)
pinned_count, pinned_width = self._pinned_statistics()
if config.val.tabs.pinned.shrink:
pinned = self._tab_pinned(index)
pinned_count, pinned_width = self._pinned_statistics()
else:
pinned = False
pinned_count, pinned_width = (0, 0)
no_pinned_count = self.count() - pinned_count
no_pinned_width = self.width() - pinned_width