| -rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp index 68b06af..30a8fba 100644 --- a/libopie2/opiemm/oimagescrollview.cpp +++ b/libopie2/opiemm/oimagescrollview.cpp @@ -97,5 +97,5 @@ void OImageScrollView::loadJpeg(bool interncall) hei = wid; } - param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei ); + param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleMin)" ).arg( wid ).arg( hei ); odebug << "Load jpeg scaled \"" << param << "\"" << oendl; iio.setParameters(param.latin1()); @@ -126,4 +126,5 @@ void OImageScrollView::setImage( const QString& path ) { if (m_lastName == path) return; m_lastName = path; + _original_data = QImage(); QString itype = QImage::imageFormat(m_lastName); odebug << "Image type = " << itype << oendl; @@ -147,4 +148,5 @@ void OImageScrollView::setImage( const QString& path ) { if (FirstResizeDone()) { generateImage(); + if (isVisible()) viewport()->repaint(true); } } @@ -351,5 +353,10 @@ void OImageScrollView::generateImage() { Rotation r = Rotate0; - if (_original_data.isNull()) return; + _pdata = QPixmap(); + if (_original_data.isNull()) { + emit imageSizeChanged( _image_data.size() ); + if (_zoomer) _zoomer->setImage( _image_data ); + return; + } { QCopEnvelope( "QPE/System", "busy()" ); @@ -360,6 +367,7 @@ void OImageScrollView::generateImage() } + odebug << " r = " << r << oendl; - if (AutoScale()) { + 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; @@ -383,5 +391,4 @@ void OImageScrollView::generateImage() _pdata.convertFromImage(_image_data); - /* * update the zoomer @@ -476,5 +483,4 @@ void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clip void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) { - odebug << "Move X and Y " << e->x() << " " << e->y() << oendl; int mx, my; mx = e->x(); @@ -483,18 +489,4 @@ void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) int diffx = _mouseStartPosX-mx; int diffy = _mouseStartPosY-my; -#if 0 - QScrollBar*xbar = horizontalScrollBar(); - QScrollBar*ybar = verticalScrollBar(); - if (xbar->value()+diffx>xbar->maxValue()) { - diffx = xbar->maxValue()-xbar->value(); - } else if (xbar->value()+diffx<0) { - diffx=0-xbar->value(); - } - if (ybar->value()+diffy>ybar->maxValue()) { - diffy = ybar->maxValue()-ybar->value(); - } else if (ybar->value()+diffy<0) { - diffy=0-ybar->value(); - } -#endif scrollBy(diffx,diffy); } |