Merge branch 'theme'

3 files changed, 11 insertions, 3 deletions

diff --git a/src/ui/Badge.cc b/src/ui/Badge.cc

index 6e73eca0..016ed64f 100644
--- a/src/ui/Badge.cc
+++ b/src/ui/Badge.cc
@@ -176,7 +176,6 @@ Badge::paintEvent(QPaintEvent *)
 
         QBrush brush;
         brush.setStyle(Qt::SolidPattern);
-        brush.setColor(isEnabled() ? backgroundColor() : QColor("#cccccc"));
 
         painter.setBrush(brush);
         painter.setPen(Qt::NoPen);
diff --git a/src/ui/OverlayWidget.cc b/src/ui/OverlayWidget.cc

index c69f81f7..ccac0116 100644
--- a/src/ui/OverlayWidget.cc
+++ b/src/ui/OverlayWidget.cc
@@ -59,3 +59,14 @@ OverlayWidget::overlayGeometry() const
 
         return widget->rect();
 }
+
+void
+OverlayWidget::paintEvent(QPaintEvent *event)
+{
+        Q_UNUSED(event);
+
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc

index e038f2dd..d80d6466 100644
--- a/src/ui/TextField.cc
+++ b/src/ui/TextField.cc
@@ -197,8 +197,6 @@ TextField::paintEvent(QPaintEvent *event)
 
         if (text().isEmpty()) {
                 painter.setOpacity(1 - state_machine_->progress());
-                // painter.fillRect(rect(),
-                // parentWidget()->palette().color(backgroundRole()));
                 painter.fillRect(rect(), backgroundColor());
         }