From 25f3f2fe15578fd4deb04a951e3e23927977e032 Mon Sep 17 00:00:00 2001
From: alwin <alwin>
Date: Fri, 23 Apr 2004 13:23:42 +0000
Subject: reduced the need of image calculations

---
(limited to 'libopie2/opiemm')

diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp
index 3f2699a..72248c1 100644
--- a/libopie2/opiemm/oimagescrollview.cpp
+++ b/libopie2/opiemm/oimagescrollview.cpp
@@ -46,7 +46,7 @@ OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const ch
     m_states[IMAGE_SCALED_LOADED]=false;
     m_states[SHOW_ZOOMER]=true;
     _original_data.convertDepth(QPixmap::defaultDepth());
-    //_original_data.setAlphaBuffer(false);
+    _original_data.setAlphaBuffer(false);
     init();
 }
 
@@ -70,7 +70,7 @@ void OImageScrollView::setImage(const QImage&img)
     _image_data = QImage();
     _original_data=img;
     _original_data.convertDepth(QPixmap::defaultDepth());
-    //_original_data.setAlphaBuffer(false);
+    _original_data.setAlphaBuffer(false);
     m_lastName = "";
     setImageIsJpeg(false);
     setImageScaledLoaded(false);
@@ -127,7 +127,7 @@ void OImageScrollView::setImage( const QString& path ) {
         setImageIsJpeg(false);
         _original_data.load(path);
         _original_data.convertDepth(QPixmap::defaultDepth());
-        //_original_data.setAlphaBuffer(false);
+        _original_data.setAlphaBuffer(false);
     }
     _image_data = QImage();
     if (FirstResizeDone()) {
@@ -401,8 +401,9 @@ void OImageScrollView::generateImage()
 
 void OImageScrollView::resizeEvent(QResizeEvent * e)
 {
-    odebug << "OImageScrollView resizeEvent" << oendl;
+    odebug << "OImageScrollView resizeEvent (" << e->size() << " - " << e->oldSize() << oendl;
     QScrollView::resizeEvent(e);
+    if (e->oldSize()==e->size()||!isUpdatesEnabled ()) return;
     generateImage();
     setFirstResizeDone(true);
     emit viewportSizeChanged( viewport()->size() );
--
cgit v0.9.0.2