| -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 @@ -45,9 +45,9 @@ OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const ch 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) @@ -69,9 +69,9 @@ 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()) { @@ -126,9 +126,9 @@ void OImageScrollView::setImage( const QString& path ) { } 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(); @@ -400,10 +400,11 @@ 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() ); |