From 7e6be517e33b43c87091e17e8c0ebe0af786430d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 30 Nov 2015 07:09:02 +0100 Subject: [PATCH] Simplify indicator_width code. --- qutebrowser/mainwindow/tabwidget.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py index 9a29b6838..c67bfd6f2 100644 --- a/qutebrowser/mainwindow/tabwidget.py +++ b/qutebrowser/mainwindow/tabwidget.py @@ -532,8 +532,7 @@ class TabBarStyle(QCommonStyle): """ color = opt.palette.base().color() rect = layouts.indicator - indicator_width = config.get('tabs', 'indicator-width') - if color.isValid() and indicator_width != 0: + if color.isValid() and rect.isValid(): p.fillRect(rect, color) def _draw_icon(self, layouts, opt, p): @@ -643,7 +642,6 @@ class TabBarStyle(QCommonStyle): indicator_padding = config.get('tabs', 'indicator-padding') text_rect = QRect(opt.rect) - indicator_rect = QRect(opt.rect) qtutils.ensure_valid(text_rect) text_rect.adjust(padding.left, padding.top, -padding.right, @@ -651,8 +649,9 @@ class TabBarStyle(QCommonStyle): indicator_width = config.get('tabs', 'indicator-width') if indicator_width == 0: - indicator_rect = 0 + indicator_rect = QRect() else: + indicator_rect = QRect(opt.rect) qtutils.ensure_valid(indicator_rect) indicator_rect.adjust(padding.left + indicator_padding.left, padding.top + indicator_padding.top,