X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fsearchview.cpp;h=6536d0b4edaebb0bf69401ccec918f6b33772185;hb=434d88418722fd7717038e44bd74271ca1d92771;hp=bf48028953b1a01f0b66e2f1fb97adb7df614159;hpb=533489a63a9716c645a11a99ca446978b20eedd0;p=minitube
diff --git a/src/searchview.cpp b/src/searchview.cpp
index bf48028..6536d0b 100644
--- a/src/searchview.cpp
+++ b/src/searchview.cpp
@@ -19,16 +19,19 @@ along with Minitube. If not, see .
$END_LICENSE */
#include "searchview.h"
+#include "channelsuggest.h"
#include "constants.h"
#include "fontutils.h"
#include "searchparams.h"
#include "ytsuggester.h"
-#include "channelsuggest.h"
#ifdef APP_MAC_SEARCHFIELD
#include "searchlineedit_mac.h"
#else
#include "searchlineedit.h"
#endif
+#ifdef APP_MAC
+#include "macutils.h"
+#endif
#ifdef APP_EXTRA
#include "extra.h"
#endif
@@ -36,22 +39,22 @@ $END_LICENSE */
#include "activation.h"
#include "activationview.h"
#endif
+#include "clickablelabel.h"
+#include "iconutils.h"
#include "mainwindow.h"
#include "painterutils.h"
-#include "iconutils.h"
-#include "clickablelabel.h"
namespace {
-static const QString recentKeywordsKey = "recentKeywords";
-static const QString recentChannelsKey = "recentChannels";
-}
+const QString recentKeywordsKey = "recentKeywords";
+const QString recentChannelsKey = "recentChannels";
+} // namespace
SearchView::SearchView(QWidget *parent) : View(parent) {
- const int padding = 30;
+ setBackgroundRole(QPalette::Base);
+ setForegroundRole(QPalette::Text);
+ setAutoFillBackground(true);
- // speedup painting since we'll paint the whole background
- // by ourselves anyway in paintEvent()
- setAttribute(Qt::WA_OpaquePaintEvent);
+ const int padding = 30;
QBoxLayout *vLayout = new QVBoxLayout(this);
vLayout->setMargin(padding);
@@ -71,8 +74,12 @@ SearchView::SearchView(QWidget *parent) : View(parent) {
hLayout->addStretch();
- logo = new ClickableLabel(this);
- logo->setPixmap(IconUtils::pixmap(":/images/app.png"));
+ logo = new ClickableLabel();
+ auto setLogoPixmap = [this] {
+ logo->setPixmap(IconUtils::pixmap(":/images/app.png", logo->devicePixelRatioF()));
+ };
+ setLogoPixmap();
+ connect(window()->windowHandle(), &QWindow::screenChanged, this, setLogoPixmap);
connect(logo, &ClickableLabel::clicked, MainWindow::instance(), &MainWindow::visitSite);
hLayout->addWidget(logo, 0, Qt::AlignTop);
hLayout->addSpacing(padding);
@@ -81,65 +88,41 @@ SearchView::SearchView(QWidget *parent) : View(parent) {
layout->setAlignment(Qt::AlignCenter);
hLayout->addLayout(layout);
- QColor titleColor = palette().color(QPalette::WindowText);
- titleColor.setAlphaF(.75);
- int r,g,b,a;
- titleColor.getRgb(&r,&g,&b,&a);
- QString cssColor = QString::asprintf("rgba(%d,%d,%d,%d)", r, g, b, a);
-
- QLabel *welcomeLabel =
- new QLabel(QString("