Merge pull request #3254 from jgkamat/jay/pinned-tabs-mnemonics

Fix Qt Mnemonics affecting min tab width
This commit is contained in:
Florian Bruhin 2017-11-07 06:15:23 +01:00 committed by GitHub
commit aaed6549b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -501,8 +501,12 @@ class TabBar(QTabBar):
""" """
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),
self.fontMetrics().width(tab_text)) def _text_to_width(text):
# Calculate text width taking into account qt mnemonics
return self.fontMetrics().size(Qt.TextShowMnemonic, text).width()
text_width = min(_text_to_width(text),
_text_to_width(tab_text))
padding = config.val.tabs.padding padding = config.val.tabs.padding
indicator_width = config.val.tabs.width.indicator indicator_width = config.val.tabs.width.indicator
indicator_padding = config.val.tabs.indicator_padding indicator_padding = config.val.tabs.indicator_padding