diff options
| author | Florian Bruhin <git@the-compiler.org> | 2017-07-05 22:15:23 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2017-07-05 22:15:23 +0200 |
| commit | d4baeb2adad2dec3c08e7c53ae2b88c969883c86 (patch) | |
| tree | 4a0906b406dd57d353355128f636ece823191906 | |
| parent | eaecfe5882f59abaecabb688340c88b8638f4b1b (diff) | |
| parent | 0304040cbbf53043573a1b1104f4f0e9efd5ba02 (diff) | |
| download | qutebrowser-d4baeb2adad2dec3c08e7c53ae2b88c969883c86.tar.gz qutebrowser-d4baeb2adad2dec3c08e7c53ae2b88c969883c86.zip | |
Merge branch 'pr/2747' into v0.11.x
| -rw-r--r-- | README.asciidoc | 2 | ||||
| -rw-r--r-- | qutebrowser/mainwindow/tabwidget.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/README.asciidoc b/README.asciidoc index 1c7e42c33..fff189cee 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -193,6 +193,7 @@ Contributors, sorted by the number of commits in descending order: * knaggita * Oliver Caldwell * Nikolay Amiantov +* Marius * Julian Weigt * Tomasz Kramkowski * Sebastian Frysztak @@ -217,7 +218,6 @@ Contributors, sorted by the number of commits in descending order: * Michał Góral * Michael Ilsaas * Martin Zimmermann -* Marius * Link * Jussi Timperi * Cosmin Popescu diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py index c7823f84e..eeee223aa 100644 --- a/qutebrowser/mainwindow/tabwidget.py +++ b/qutebrowser/mainwindow/tabwidget.py @@ -761,6 +761,17 @@ class TabBarStyle(QCommonStyle): rct = super().subElementRect(sr, opt, widget) return rct else: + try: + # We need this so the left scroll button is aligned properly. + # Otherwise, empty space will be shown after the last tab even + # though the button width is set to 0 + # + # QStyle.SE_TabBarScrollLeftButton was added in Qt 5.7 + if sr == QStyle.SE_TabBarScrollLeftButton: + return super().subElementRect(sr, opt, widget) + except AttributeError: + pass + return self._style.subElementRect(sr, opt, widget) def _tab_layout(self, opt): |