Merge branch 'rokm-adwaita-fix'

CHANGELOG.asciidoc

@@ -139,6 +139,7 @@ Fixed
   mode.
 - `:tab-detach` now fails correctly when there's only one tab open.
 - Various small issues with the command completion
+- The tabbar now displays correctly with the Adwaita Qt theme
 
 v0.8.3 (unreleased)
 -------------------

README.asciidoc

@@ -238,6 +238,7 @@ Contributors, sorted by the number of commits in descending order:
 * Tim Harder
 * Thiago Barroso Perrotta
 * Sorokin Alexei
+* Rok Mandeljc
 * Noah Huesser
 * Moez Bouhlel
 * Matthias Lisin

qutebrowser/mainwindow/tabwidget.py

@@ -50,6 +50,7 @@ class TabWidget(QTabWidget):
     def __init__(self, win_id, parent=None):
         super().__init__(parent)
         bar = TabBar(win_id)
+        self.setStyle(TabBarStyle(self.style()))
         self.setTabBar(bar)
         bar.tabCloseRequested.connect(self.tabCloseRequested)
         bar.tabMoved.connect(functools.partial(
@@ -656,6 +657,12 @@ class TabBarStyle(QCommonStyle):
         if sr == QStyle.SE_TabBarTabText:
             layouts = self._tab_layout(opt)
             return layouts.text
+        elif sr == QStyle.SE_TabWidgetTabBar:
+            # Need to use super() because we also use super() to render
+            # element in drawControl(); otherwise, we may get bit by
+            # style differences...
+            rct = super().subElementRect(sr, opt, widget)
+            return rct
         else:
             return self._style.subElementRect(sr, opt, widget)