fixed some activation issues in combination with split views

[dolphin.git] / src / pixmapviewer.cpp

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 351f6463fafa7824d69557d293662a9f4096c03c..79e2487a70d22ad5fc0158a7f65e14c1e8ffed32 100644 (file)
--- 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  *
@@ -23,20 +22,18 @@
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
-#include <QtDebug>
+#include <QtGui/QKeyEvent>
 
-PixmapViewer::PixmapViewer(QWidget* parent) :
+PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
+    m_transition(transition),
     m_animationStep(0)
 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);
 
-    m_animation.setDuration(750);
-
+    m_animation.setDuration(300);
     connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));
-    connect(&m_animation, SIGNAL(finished()), this, SLOT(finishTransition()));
 }
 
 PixmapViewer::~PixmapViewer()
@@ -49,30 +46,14 @@ void PixmapViewer::setPixmap(const QPixmap& pixmap)
         return;
     }
 
-    m_pendingPixmap = pixmap;
+    m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;
+    m_pixmap = pixmap;
+    update();
 
-    if (m_animation.state() == QTimeLine::NotRunning) {
-        beginTransition();
-    }
-}
-
-void PixmapViewer::beginTransition()
-{
-    Q_ASSERT(!m_pendingPixmap.isNull());
-    Q_ASSERT(m_nextPixmap.isNull());
-
-    m_nextPixmap = m_pendingPixmap;
-    m_pendingPixmap = QPixmap();
-    m_animation.start();
-}
-
-void PixmapViewer::finishTransition()
-{
-    m_pixmap = m_nextPixmap;
-    m_nextPixmap = QPixmap();
-
-    if (!m_pendingPixmap.isNull()) {
-        beginTransition();
+    const bool animate = (m_transition != NoTransition) &&
+                         (m_pixmap.size() != m_oldPixmap.size());
+    if (animate) {
+        m_animation.start();
     }
 }
 
@@ -80,24 +61,23 @@ 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;
+    QPainter painter(this);
 
-    if (!m_nextPixmap.isNull()) {
-        const int nextPixmapX = (width() - m_nextPixmap.width()) / 2;
-        const int nextPixmapY = (height() - m_nextPixmap.height()) / 2;
+    const float value = m_animation.currentValue();
 
-        painter.setOpacity( 1 - m_animation.currentValue() );
-        painter.drawPixmap(x, y, m_pixmap);
-        painter.setOpacity( m_animation.currentValue() );
-        painter.drawPixmap(nextPixmapX,nextPixmapY,m_nextPixmap);
-    } else {
-        painter.drawPixmap(x, y, m_pixmap);
-    }
+    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;
 
-    painter.end();
+    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::SmoothTransformation);
+    painter.drawPixmap(x, y, scaledPixmap);
 }
 
 #include "pixmapviewer.moc"