X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/da3bc09d21b43837873c899e2fbda1fa6c2a2e5e..684678bd371f6fed0ae7d551afda97ea2c6b78d0:/src/pixmapviewer.cpp

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 36d583c1d..a7a593bb0 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -1,6 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -21,19 +20,26 @@
 #include "pixmapviewer.h"
 
 #include <kiconloader.h>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
 
-PixmapViewer::PixmapViewer(QWidget* parent) :
+#include <QPainter>
+#include <QPixmap>
+#include <QKeyEvent>
+
+PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
+    m_transition(transition),
     m_animationStep(0)
 {
-    setMinimumWidth(K3Icon::SizeEnormous);
-    setMinimumWidth(K3Icon::SizeEnormous);
+    setMinimumWidth(KIconLoader::SizeEnormous);
+    setMinimumHeight(KIconLoader::SizeEnormous);
+
+    m_animation.setDuration(150);
+    m_animation.setCurveShape(QTimeLine::LinearCurve);
 
-    m_animation.setDuration(300);
-    connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
+    if (m_transition != NoTransition) {
+        connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
+        connect(&m_animation, SIGNAL(finished()), this, SLOT(checkPendingPixmaps()));
+    }
 }
 
 PixmapViewer::~PixmapViewer()
@@ -46,10 +52,24 @@ void PixmapViewer::setPixmap(const QPixmap& pixmap)
         return;
     }
 
+    if ((m_transition != NoTransition) && (m_animation.state() == QTimeLine::Running)) {
+        m_pendingPixmaps.enqueue(pixmap);
+        if (m_pendingPixmaps.count() > 5) {
+            // don't queue more than 5 pixmaps
+            m_pendingPixmaps.takeFirst();
+        }
+        return;
+    }
+
     m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
     m_pixmap = pixmap;
+    update();
 
-    m_animation.start();
+    const bool animate = (m_transition != NoTransition) &&
+                         (m_pixmap.size() != m_oldPixmap.size());
+    if (animate) {
+        m_animation.start();
+    }
 }
 
 void PixmapViewer::paintEvent(QPaintEvent* event)
@@ -58,17 +78,39 @@ void PixmapViewer::paintEvent(QPaintEvent* event)
 
     QPainter painter(this);
 
-    const float value = m_animation.currentValue();
+    if (m_transition != NoTransition) {
+        const float value = m_animation.currentValue();
+        const int scaledWidth  = static_cast<int>((m_oldPixmap.width()  * (1.0 - value)) + (m_pixmap.width()  * value));
+        const int scaledHeight = static_cast<int>((m_oldPixmap.height() * (1.0 - value)) + (m_pixmap.height() * value));
+
+        const int x = (width()  - scaledWidth ) / 2;
+        const int y = (height() - scaledHeight) / 2;
 
-    const int scaledWidth  = static_cast<int>((m_oldPixmap.width()  * (1.0 - value)) + (m_pixmap.width()  * value));
-    const int scaledHeight = static_cast<int>((m_oldPixmap.height() * (1.0 - value)) + (m_pixmap.height() * value));
-    const int x = (width()  - scaledWidth ) / 2;
-    const int y = (height() - scaledHeight) / 2;
+        const bool useOldPixmap = (m_transition == SizeTransition) &&
+                                  (m_oldPixmap.width() > m_pixmap.width());
+        const QPixmap& largePixmap = useOldPixmap ? m_oldPixmap : m_pixmap;
+        const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
+                                                        scaledHeight,
+                                                        Qt::IgnoreAspectRatio,
+                                                        Qt::FastTransformation);
+        painter.drawPixmap(x, y, scaledPixmap);
+    } else {
+        const int x = (width()  - m_pixmap.width() ) / 2;
+        const int y = (height() - m_pixmap.height()) / 2;
+        painter.drawPixmap(x, y, m_pixmap);
+    }
+}
 
-    if (m_oldPixmap.width() > m_pixmap.width()) {
-        painter.drawPixmap(x, y, m_oldPixmap.scaled(scaledWidth, scaledHeight));
+void PixmapViewer::checkPendingPixmaps()
+{
+    if (m_pendingPixmaps.count() > 0) {
+        QPixmap pixmap = m_pendingPixmaps.dequeue();
+        m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
+        m_pixmap = pixmap;
+        update();
+        m_animation.start();
     } else {
-        painter.drawPixmap(x, y, m_pixmap.scaled(scaledWidth, scaledHeight));
+        m_oldPixmap = m_pixmap;
     }
 }