Fixed view crossfade

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index a195e302e51de73ae10cd65566347d05dee138cc..dea39a32f7178212aad175f25c0cd338cf9d5efa 100755 (executable)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -391,6 +391,8 @@ void MainWindow::showWidget ( QWidget* widget ) {
     // toolbar only for the mediaView
     mainToolBar->setVisible(widget == mediaView && !compactViewAct->isChecked());
 
+    setUpdatesEnabled(true);
+
     history->push(widget);
 
 #ifdef Q_WS_MAC
@@ -401,7 +403,6 @@ void MainWindow::showWidget ( QWidget* widget ) {
 
     views->setCurrentWidget(widget);
 
-    setUpdatesEnabled(true);
 }
 
 void MainWindow::fadeInWidget(QWidget *oldWidget, QWidget *newWidget) {

diff --git a/src/faderwidget/FaderWidget.cpp b/src/faderwidget/FaderWidget.cpp
index aaaa65a9a5c268644afc7470be203d7f3aa854bd..6963a8c13ad51756337040b8971a01d35417717e 100644 (file)
--- a/src/faderwidget/FaderWidget.cpp
+++ b/src/faderwidget/FaderWidget.cpp
@@ -4,7 +4,7 @@
 
 FaderWidget::FaderWidget(QWidget *parent) : QWidget(parent) {
     timeLine = new QTimeLine(333, this);
-    timeLine->setFrameRange(1000, 0);
+    timeLine->setFrameRange(500, 0);
     connect(timeLine, SIGNAL(frameChanged(int)), this, SLOT(update()));
     setAttribute(Qt::WA_DeleteOnClose);
     resize(parent->size());
@@ -17,10 +17,10 @@ void FaderWidget::start(QPixmap frozenView) {
 }
 
 void FaderWidget::paintEvent(QPaintEvent *) {
-    const qreal opacity = timeLine->currentFrame() / 1000.;
+    const qreal opacity = timeLine->currentFrame() / 500.;
     QPainter painter(this);
     painter.setOpacity(opacity);
-    painter.drawPixmap(rect(), frozenView);
+    painter.drawPixmap(0, 0, frozenView);
 
     if (opacity <= 0.)
         close();