Diffstat (limited to 'libopie2/opiemm/oimagescrollview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 9 |
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 @@ -43,13 +43,13 @@ OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const ch 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("") { @@ -67,13 +67,13 @@ OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const c 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(); } @@ -124,13 +124,13 @@ void OImageScrollView::setImage( const QString& path ) { 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); } @@ -398,14 +398,15 @@ void OImageScrollView::generateImage() 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() ); } |