-rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.cpp | 30 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.h | 2 |
2 files changed, 21 insertions, 11 deletions
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp index 98054ff..ad19219 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp +++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp @@ -15,12 +15,14 @@ ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f ) } ImageScrollView::ImageScrollView (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),scale_to_fit(always_scale), rotate_to_fit(rfit),first_resize_done(false),m_lastName("") { + _original_data.convertDepth(QPixmap::defaultDepth()); + _original_data.setAlphaBuffer(false); init(); } ImageScrollView::ImageScrollView (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(),scale_to_fit(always_scale), rotate_to_fit(rfit),first_resize_done(false),m_lastName("") @@ -30,23 +32,27 @@ ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const cha } void ImageScrollView::setImage(const QImage&img) { _image_data = QImage(); _original_data=img; + _original_data.convertDepth(QPixmap::defaultDepth()); + _original_data.setAlphaBuffer(false); m_lastName = ""; if (first_resize_done) { generateImage(); } } void ImageScrollView::setImage( const QString& path ) { odebug << "load new image " << oendl; if (m_lastName == path) return; m_lastName = path; _original_data.load(path); + _original_data.convertDepth(QPixmap::defaultDepth()); + _original_data.setAlphaBuffer(false); _image_data = QImage(); if (first_resize_done) { generateImage(); } } @@ -241,12 +247,14 @@ void ImageScrollView::generateImage() } else { rotate_into_data(r); } last_rot = r; resizeContents(_image_data.width(),_image_data.height()); } + _pdata.convertFromImage(_image_data); + _image_data=QImage(); } void ImageScrollView::resizeEvent(QResizeEvent * e) { odebug << "ImageScrollView resizeEvent" << oendl; QScrollView::resizeEvent(e); @@ -282,34 +290,34 @@ void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw int w = clipw; int h = cliph; int x = clipx; int y = clipy; bool erase = false; - if (!_image_data.size().isValid()) { + if (!_pdata.size().isValid()) { p->fillRect(clipx,clipy,clipw,cliph,white); return; } - if (w>_image_data.width()) { - w=_image_data.width(); + if (w>_pdata.width()) { + w=_pdata.width(); x = 0; erase = true; - } else if (x+w>_image_data.width()){ - x = _image_data.width()-w; + } else if (x+w>_pdata.width()){ + x = _pdata.width()-w; } - if (h>_image_data.height()) { - h=_image_data.height(); + if (h>_pdata.height()) { + h=_pdata.height(); y = 0; erase = true; - } else if (y+h>_image_data.height()){ - y = _image_data.height()-h; + } else if (y+h>_pdata.height()){ + y = _pdata.height()-h; } - if (erase||_image_data.hasAlphaBuffer()) { + if (erase||_original_data.hasAlphaBuffer()) { p->fillRect(clipx,clipy,clipw,cliph,white); } - p->drawImage(clipx,clipy,_image_data,x,y,w,h); + p->drawPixmap(clipx,clipy,_pdata,x,y,w,h); } /* using the real geometry points and not the translated points is wanted! */ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) { int mx, my; diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h index 17e2f5f..eb91dbd 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.h +++ b/noncore/graphics/opie-eye/gui/imagescrollview.h @@ -1,11 +1,12 @@ #ifndef _IMAGE_SCROLL_VIEW_H #define _IMAGE_SCROLL_VIEW_H #include <qscrollview.h> #include <qimage.h> +#include <qpixmap.h> #include <qstring.h> #include <qdialog.h> class QPainter; class ImageScrollView:public QScrollView @@ -37,12 +38,13 @@ signals: protected: virtual void drawContents ( QPainter * p, int clipx, int clipy, int clipw, int cliph ); void init(); QImage _image_data; QImage _original_data; + QPixmap _pdata; int _mouseStartPosX,_mouseStartPosY; bool scale_to_fit; bool rotate_to_fit; bool first_resize_done; |