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 4fe451a8c6416a869d4dff7c3314edc491f24fa9..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  *
  *                                                                         *
  *   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,13 +22,18 @@
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>

-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>

 
 

-PixmapViewer::PixmapViewer(QWidget* parent) :
-    QWidget(parent)
+PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
+    QWidget(parent),
+    m_transition(transition),
+    m_animationStep(0)

 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);
 {
     setMinimumWidth(K3Icon::SizeEnormous);
     setMinimumWidth(K3Icon::SizeEnormous);

+
+    m_animation.setDuration(300);
+    connect(&m_animation, SIGNAL(valueChanged(qreal)), this, SLOT(update()));

 }
 
 PixmapViewer::~PixmapViewer()
 }
 
 PixmapViewer::~PixmapViewer()


@@ -38,20 +42,42 @@ PixmapViewer::~PixmapViewer()
 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {
 
 void PixmapViewer::setPixmap(const QPixmap& pixmap)
 {

+    if (pixmap.isNull()) {
+        return;
+    }
+
+    m_oldPixmap = m_pixmap.isNull() ? pixmap : m_pixmap;

     m_pixmap = pixmap;
     update();
     m_pixmap = pixmap;
     update();

+
+    const bool animate = (m_transition != NoTransition) &&
+                         (m_pixmap.size() != m_oldPixmap.size());
+    if (animate) {
+        m_animation.start();
+    }

 }
 
 void PixmapViewer::paintEvent(QPaintEvent* event)
 {
     QWidget::paintEvent(event);
 
 }
 
 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 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"
 }
 
 #include "pixmapviewer.moc"