X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..61a4e8691d600a1d105142ce44570c4107600a04:/src/pixmapviewer.cpp

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 798771078..e4d417d47 100644
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -20,39 +20,57 @@
 
 #include "pixmapviewer.h"
 
-#include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <qpainter.h>
-//Added by qt3to4:
-#include <QPixmap>
-#include <QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPaintEvent>
 
 PixmapViewer::PixmapViewer(QWidget* parent) :
-        QWidget(parent)
+    QWidget(parent),
+    m_animationStep(0)
 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);
+
+    m_animation.setDuration(300);
+    connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
 }
 
 PixmapViewer::~PixmapViewer()
-{}
+{
+}
 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {
+    if (pixmap.isNull()) {
+        return;
+    }
+
+    m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
     m_pixmap = pixmap;
-    update();
+
+    m_animation.start();
 }
 
 void PixmapViewer::paintEvent(QPaintEvent* event)
 {
     QWidget::paintEvent(event);
 
-    QPainter painter;
-    painter.begin(this);
-    const int x = (width() - m_pixmap.width()) / 2;
-    const int y = (height() - m_pixmap.height()) / 2;
-    painter.drawPixmap(x, y, m_pixmap);
-    painter.end();
+    QPainter painter(this);
+
+    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 QPixmap& largePixmap = (m_oldPixmap.width() > m_pixmap.width()) ? m_oldPixmap : m_pixmap;
+    const QPixmap scaledPixmap = largePixmap.scaled(scaledWidth,
+                                                    scaledHeight,
+                                                    Qt::IgnoreAspectRatio,
+                                                    Qt::SmoothTransformation);
+    painter.drawPixmap(x, y, scaledPixmap);
 }
 
 #include "pixmapviewer.moc"