From 0dfbfb35456e2a4e5f08e0cedc75b0ecff212e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Tue, 30 Dec 2014 14:56:29 +0100 Subject: [PATCH] fixed comics views transition animation in MacOSX --- YACReaderLibrary/comics_view_transition.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/YACReaderLibrary/comics_view_transition.cpp b/YACReaderLibrary/comics_view_transition.cpp index 3e2fdd12..6734d479 100644 --- a/YACReaderLibrary/comics_view_transition.cpp +++ b/YACReaderLibrary/comics_view_transition.cpp @@ -22,7 +22,15 @@ ComicsViewTransition::ComicsViewTransition(QWidget *parent) : movieLabel->setAlignment(Qt::AlignCenter); QLabel * textLabel = new QLabel("Switching comics view"); textLabel->setAlignment(Qt::AlignCenter); + +#ifdef Q_OS_MAC + textLabel->setStyleSheet("QLabel {color:#888888; font-size:24px;font-family:Arial;font-weight:bold;}"); + setStyleSheet("QWidget {background:#FFFFFF}"); +#else textLabel->setStyleSheet("QLabel {color:#CCCCCC; font-size:24px;font-family:Arial;font-weight:bold;}"); + setStyleSheet("QWidget {background:#2A2A2A}"); +#endif + //movieLabel->setFixedSize(450,350); layout->addSpacing(100); @@ -35,8 +43,6 @@ ComicsViewTransition::ComicsViewTransition(QWidget *parent) : setContentsMargins(0,0,0,0); - setStyleSheet("QWidget {background:#2A2A2A}"); - //QSizePolicy sp(); setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding ); //movieLabel->setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Expanding ); @@ -70,5 +76,10 @@ void ComicsViewTransition::startMovie() 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 }