1 files changed, 10 insertions, 6 deletions

diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp
index 61b2062..a8165a4 100644
--- a/libopie2/opiemm/oimagescrollview.cpp
+++ b/libopie2/opiemm/oimagescrollview.cpp
@@ -156,9 +156,9 @@ void OImageScrollView::init()
             _zoomer, SLOT(setImageSize(const QSize&)) );
     connect(this,SIGNAL(viewportSizeChanged(const QSize&)),
             _zoomer, SLOT(setViewPortSize(const QSize&)) );
 
-    viewport()->setBackgroundColor(white);
+    setBackgroundColor(white);
     setFocusPolicy(QWidget::StrongFocus);
     setImageScaledLoaded(false);
     setImageIsJpeg(false);
     if (FirstResizeDone()) {
@@ -350,9 +350,9 @@ void OImageScrollView::generateImage()
         width()<height()&&_original_data.width()>_original_data.height()) {
         if (AutoRotate()) r = Rotate90;
     }
 
-
+    int twidth,theight;
     odebug << " r = " << r << oendl;
     if (AutoScale() && (_original_data.width()>width() || _original_data.height() > height()) ) {
         if (!_image_data.size().isValid()||width()>_image_data.width()||height()>_image_data.height()) {
             odebug << "Rescaling data" << oendl;
@@ -362,26 +362,27 @@ void OImageScrollView::generateImage()
                 rotate_into_data(r);
             }
         }
         rescaleImage(width(),height());
-        resizeContents(_image_data.width(),_image_data.height());
     }  else if (!FirstResizeDone()||r!=m_last_rot||_image_data.width()==0) {
         if (r==Rotate0) {
             _image_data = _original_data;
         } else {
             rotate_into_data(r);
         }
         m_last_rot = r;
-        resizeContents(_image_data.width(),_image_data.height());
     }
     _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) {
@@ -392,8 +393,11 @@ void OImageScrollView::generateImage()
     /*
      * invalidate
      */
     _image_data=QImage();
+    if (isVisible()) {
+        updateContents(contentsX(),contentsY(),width(),height());
+    }
 }
 
 void OImageScrollView::resizeEvent(QResizeEvent * e)
 {
@@ -436,9 +440,9 @@ void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clip
     int y = clipy;
     bool erase = false;
 
     if (!_pdata.size().isValid()) {
-        p->fillRect(clipx,clipy,clipw,cliph,white);
+        p->fillRect(clipx,clipy,clipw,cliph, backgroundColor());
         return;
     }
     if (w>_pdata.width()) {
         w=_pdata.width();
@@ -454,9 +458,9 @@ void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clip
     } else if (y+h>_pdata.height()){
         y = _pdata.height()-h;
     }
     if (erase||_original_data.hasAlphaBuffer()) {
-        p->fillRect(clipx,clipy,clipw,cliph,white);
+        p->fillRect(clipx,clipy,clipw,cliph, backgroundColor());
     }
     p->drawPixmap(clipx,clipy,_pdata,x,y,w,h);
 }