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 4e3aa4830f9d1926dbe508ab0d58c6a5e5d36315..79e2487a70d22ad5fc0158a7f65e14c1e8ffed32 100644 (file)
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QPaintEvent>
+#include <QtGui/QKeyEvent>
 
 PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) :
     QWidget(parent),
@@ -50,7 +50,9 @@ void PixmapViewer::setPixmap(const QPixmap& pixmap)
     m_pixmap = pixmap;
     update();
 
-    if (m_transition != NoTransition) {
+    const bool animate = (m_transition != NoTransition) &&
+                         (m_pixmap.size() != m_oldPixmap.size());
+    if (animate) {
         m_animation.start();
     }
 }