1 files changed, 5 insertions, 4 deletions

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
@@ -17,146 +17,146 @@
 #define IMAGE_SCALED_LOADED 5
 
 #define SCROLLVIEW_BITSET_SIZE 6
 
 namespace Opie {
 namespace MM {
 OImageScrollView::OImageScrollView( QWidget* parent, const char* name,  WFlags f )
     :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),
     m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
     _zoomer = 0;
     m_states[AUTO_SCALE]=true;
     m_states[AUTO_ROTATE]=true;
     m_states[FIRST_RESIZE_DONE]=false;
     m_states[IMAGE_IS_JPEG]=false;
     m_states[IMAGE_SCALED_LOADED]=false;
     m_states[SHOW_ZOOMER]=true;
     init();
 }
 
 OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
     :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),
      m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
     _zoomer = 0;
     m_states[AUTO_SCALE]=always_scale;
     m_states[AUTO_ROTATE]=rfit;
     m_states[FIRST_RESIZE_DONE]=false;
     m_states[IMAGE_IS_JPEG]=false;
     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();
 }
 
 OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit)
     :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),m_states(SCROLLVIEW_BITSET_SIZE),m_lastName("")
 {
     _zoomer = 0;
     m_states.resize(SCROLLVIEW_BITSET_SIZE);
     m_states[AUTO_SCALE]=always_scale;
     m_states[AUTO_ROTATE]=rfit;
     m_states[FIRST_RESIZE_DONE]=false;
     m_states[IMAGE_IS_JPEG]=false;
     m_states[IMAGE_SCALED_LOADED]=false;
     m_states[SHOW_ZOOMER]=true;
     init();
     setImage(img);
 }
 
 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);
     if (FirstResizeDone()) {
         generateImage();
     }
 }
 
 void OImageScrollView::loadJpeg(bool interncall)
 {
     if (m_lastName.isEmpty()) return;
     QImageIO iio( m_lastName, 0l );
     QString param;
     bool real_load = false;
     if (AutoScale()) {
         if (!interncall) {
             int wid, hei;
             wid = QApplication::desktop()->width();
             hei = QApplication::desktop()->height();
             if (hei>wid) {
                 wid = hei;
             } else {
                 hei = wid;
             }
             param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleMin)" ).arg( wid ).arg( hei );
             odebug << "Load jpeg scaled \"" << param << "\"" << oendl;
             iio.setParameters(param.latin1());
             setImageScaledLoaded(true);
             real_load = true;
         }
     } else {
         if (ImageScaledLoaded()||!interncall) {
             odebug << "Load jpeg unscaled" << oendl;
             real_load = true;
         }
         setImageScaledLoaded(false);
     }
     if (real_load) {
         _original_data = iio.read() ? iio.image() : QImage();
     }
 }
 
 void OImageScrollView::setImage( const QString& path ) {
     odebug << "load new image " << oendl;
     if (m_lastName == path) return;
     m_lastName = path;
     _original_data = QImage();
     QString itype = QImage::imageFormat(m_lastName);
     odebug << "Image type = " << itype << oendl;
     if (itype == "JPEG") {
         setImageIsJpeg(true);
         loadJpeg();
     } else {
         setImageIsJpeg(false);
         _original_data.load(path);
         _original_data.convertDepth(QPixmap::defaultDepth());
-        //_original_data.setAlphaBuffer(false);
+        _original_data.setAlphaBuffer(false);
     }
     _image_data = QImage();
     if (FirstResizeDone()) {
         generateImage();
         if (isVisible()) viewport()->repaint(true);
     }
 }
 
 /* should be called every time the QImage changed it content */
 void OImageScrollView::init()
 {
     odebug << "init " << oendl;
 
     /*
      * create the zoomer
      * and connect ther various signals
      */
     _zoomer = new Opie::MM::OImageZoomer( this, "The Zoomer" );
     connect(_zoomer, SIGNAL( zoomAreaRel(int,int)),
             this, SLOT(scrollBy(int,int)) );
     connect(_zoomer, SIGNAL( zoomArea(int,int)),
             this, SLOT(center(int,int)) );
     connect(this,SIGNAL(contentsMoving(int,int)),
             _zoomer, (SLOT(setVisiblePoint(int,int))) );
     connect(this,SIGNAL(imageSizeChanged(const QSize&)),
             _zoomer, SLOT(setImageSize(const QSize&)) );
     connect(this,SIGNAL(viewportSizeChanged(const QSize&)),
             _zoomer, SLOT(setViewPortSize(const QSize&)) );
 
     setBackgroundColor(white);
     setFocusPolicy(QWidget::StrongFocus);
     setImageScaledLoaded(false);
@@ -372,66 +372,67 @@ void OImageScrollView::generateImage()
         m_last_rot = r;
     }
     _pdata.convertFromImage(_image_data);
     twidth = _image_data.width();
     theight = _image_data.height();
 
     /*
      * update the zoomer
      */
     check_zoomer();
     emit imageSizeChanged( _image_data.size() );
     rescaleImage( 128, 128 );
     resizeContents(twidth,theight);
     /*
      * move scrollbar
      */
      if (_zoomer) {
         _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2,
              _image_data.width()/2, _image_data.height()/2 );
         _zoomer->setImage( _image_data );
      }
     /*
      * invalidate
      */
     _image_data=QImage();
     if (isVisible()) {
         updateContents(contentsX(),contentsY(),width(),height());
     }
 }
 
 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() );
 
 }
 
 void OImageScrollView::keyPressEvent(QKeyEvent * e)
 {
     if (!e) return;
     int dx = horizontalScrollBar()->lineStep();
     int dy = verticalScrollBar()->lineStep();
     if (e->key()==Qt::Key_Right) {
         scrollBy(dx,0);
         e->accept();
     } else if (e->key()==Qt::Key_Left) {
         scrollBy(0-dx,0);
         e->accept();
     } else if (e->key()==Qt::Key_Up) {
         scrollBy(0,0-dy);
         e->accept();
     } else if (e->key()==Qt::Key_Down) {
         scrollBy(0,dy);
         e->accept();
     } else {
         e->ignore();
     }
     QScrollView::keyPressEvent(e);
 }
 
 void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
 {
     if (!_pdata.size().isValid()) {