New upstream version 3.1

[minitube] / src / refinesearchbutton.cpp

diff --git a/src/refinesearchbutton.cpp b/src/refinesearchbutton.cpp
index 361fe3a930c8be1fb680e3aacfdd04e2d351a79b..1091e56d9edeed41a7e1b6c74094202252ab869d 100644 (file)
--- a/src/refinesearchbutton.cpp
+++ b/src/refinesearchbutton.cpp
@@ -21,9 +21,7 @@ $END_LICENSE */
 #include "refinesearchbutton.h"
 #include "iconutils.h"
 
-RefineSearchButton::RefineSearchButton(QWidget *parent) :
-    QPushButton(parent) {
-
+RefineSearchButton::RefineSearchButton(QWidget *parent) : QPushButton(parent) {
     hovered = false;
 
     const int refineButtonSize = 48;
@@ -32,23 +30,21 @@ RefineSearchButton::RefineSearchButton(QWidget *parent) :
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 }
 
-void RefineSearchButton::paintBackground() const {
-
-}
-
 void RefineSearchButton::paintEvent(QPaintEvent *) {
+    QColor backgroundColor = palette().windowText().color();
+    backgroundColor.setAlpha(hovered ? 192 : 170);
+
     QPainter painter(this);
     painter.setRenderHints(QPainter::Antialiasing, true);
     painter.setPen(Qt::NoPen);
-    painter.setBrush(QColor(0,0,0, hovered ? 192 : 170));
-    painter.drawEllipse(QPoint(width(), height()), width()-2, height()-2);
+    painter.setBrush(backgroundColor);
+    painter.drawEllipse(QPoint(width(), height()), width() - 2, height() - 2);
 
-    QPixmap pixmap = IconUtils::pixmap(":/images/refine-search.png");
+    QPixmap pixmap =
+            IconUtils::iconPixmap("refine-search", 24, backgroundColor, devicePixelRatioF());
     int pw = pixmap.width() / pixmap.devicePixelRatio();
     int ph = pixmap.height() / pixmap.devicePixelRatio();
-    painter.drawPixmap(width() - pw - 6, height() - ph - 6,
-                       pw, ph,
-                       pixmap);
+    painter.drawPixmap(width() - pw - 6, height() - ph - 6, pw, ph, pixmap);
 }
 
 void RefineSearchButton::enterEvent(QEvent *) {