From 53fcc52dd695517932ab46017666b62934763850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 7 Sep 2018 12:33:15 +0200 Subject: [PATCH] Inject ComicsViewTransition background color as a string. --- YACReaderLibrary/comics_view_transition.cpp | 18 ++++-------------- YACReaderLibrary/comics_view_transition.h | 6 ++++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/YACReaderLibrary/comics_view_transition.cpp b/YACReaderLibrary/comics_view_transition.cpp index c22bbc8a..33c63980 100644 --- a/YACReaderLibrary/comics_view_transition.cpp +++ b/YACReaderLibrary/comics_view_transition.cpp @@ -10,14 +10,10 @@ #include "yacreader_global_gui.h" -ComicsViewTransition::ComicsViewTransition(QWidget *parent) - : QWidget(parent) +ComicsViewTransition::ComicsViewTransition(const QString &backgroundColor, QWidget *parent) + : QWidget(parent), backgroundColor(backgroundColor), painter(this) { -#ifdef Q_OS_MAC - setStyleSheet("QWidget {background:#FFFFFF}"); -#else - setStyleSheet("QWidget {background:#2A2A2A}"); -#endif + setStyleSheet(QString("QWidget {background:%1").arg(backgroundColor)); } QSize ComicsViewTransition::sizeHint() @@ -27,11 +23,5 @@ QSize ComicsViewTransition::sizeHint() void ComicsViewTransition::paintEvent(QPaintEvent *) { - QPainter painter(this); - -#ifdef Q_OS_MAC - painter.fillRect(0, 0, width(), height(), QColor("#FFFFFF")); -#else - painter.fillRect(0, 0, width(), height(), QColor("#2A2A2A")); -#endif + painter.fillRect(0, 0, width(), height(), backgroundColor); } diff --git a/YACReaderLibrary/comics_view_transition.h b/YACReaderLibrary/comics_view_transition.h index 7f2cc7b0..2e49923c 100644 --- a/YACReaderLibrary/comics_view_transition.h +++ b/YACReaderLibrary/comics_view_transition.h @@ -7,11 +7,13 @@ class ComicsViewTransition : public QWidget { Q_OBJECT public: - explicit ComicsViewTransition(QWidget *parent = nullptr); + explicit ComicsViewTransition(const QString& backgroundColor, QWidget *parent = nullptr); QSize sizeHint(); protected: - void paintEvent(QPaintEvent *) override; + void paintEvent(QPaintEvent *); + QColor backgroundColor; + QPainter painter; }; #endif // COMICS_VIEW_TRANSITION_H