summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-23 13:23:42 (UTC)
committer alwin <alwin>2004-04-23 13:23:42 (UTC)
commit25f3f2fe15578fd4deb04a951e3e23927977e032 (patch) (side-by-side diff)
tree3768cf6f77f04c852caabb22e332f3e070709903
parentda6a98dbc555018a29bf140ed8e890015240b322 (diff)
downloadopie-25f3f2fe15578fd4deb04a951e3e23927977e032.zip
opie-25f3f2fe15578fd4deb04a951e3e23927977e032.tar.gz
opie-25f3f2fe15578fd4deb04a951e3e23927977e032.tar.bz2
reduced the need of image calculations
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiemm/oimagescrollview.cpp9
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() );