| -rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp index a8165a4..73df3ff 100644 --- a/libopie2/opiemm/oimagescrollview.cpp +++ b/libopie2/opiemm/oimagescrollview.cpp @@ -319,244 +319,259 @@ void OImageScrollView::rotate_into_data(Rotation r) for ( x=0; x < _original_data.numColors(); ++x ) destTable[x] = srcTable[x]; for ( y=0; y < _original_data.height(); ++y ) { srcData = (unsigned char *)_original_data.scanLine(y); for ( x=0; x < _original_data.width(); ++x ) { destData = (unsigned char *)dest.scanLine(_original_data.width()-x-1); destData[y] = srcData[x]; } } break; default: dest = _original_data; break; } } _image_data = dest; } void OImageScrollView::generateImage() { Rotation r = Rotate0; _pdata = QPixmap(); if (_original_data.isNull()) { emit imageSizeChanged( _image_data.size() ); if (_zoomer) _zoomer->setImage( _image_data ); return; } if (width()>height()&&_original_data.width()<_original_data.height() || width()<height()&&_original_data.width()>_original_data.height()) { if (AutoRotate()) r = Rotate90; } int twidth,theight; odebug << " r = " << r << oendl; 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; if (r==Rotate0) { _image_data = _original_data; } else { rotate_into_data(r); } } rescaleImage(width(),height()); } else if (!FirstResizeDone()||r!=m_last_rot||_image_data.width()==0) { if (r==Rotate0) { _image_data = _original_data; } else { rotate_into_data(r); } m_last_rot = r; } _pdata.convertFromImage(_image_data); twidth = _image_data.width(); theight = _image_data.height(); /* * update the zoomer */ check_zoomer(); emit imageSizeChanged( _image_data.size() ); rescaleImage( 128, 128 ); resizeContents(twidth,theight); /* * move scrollbar */ if (_zoomer) { _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2, _image_data.width()/2, _image_data.height()/2 ); _zoomer->setImage( _image_data ); } /* * invalidate */ _image_data=QImage(); if (isVisible()) { updateContents(contentsX(),contentsY(),width(),height()); } } void OImageScrollView::resizeEvent(QResizeEvent * e) { odebug << "OImageScrollView resizeEvent" << oendl; QScrollView::resizeEvent(e); generateImage(); setFirstResizeDone(true); emit viewportSizeChanged( viewport()->size() ); } void OImageScrollView::keyPressEvent(QKeyEvent * e) { if (!e) return; int dx = horizontalScrollBar()->lineStep(); int dy = verticalScrollBar()->lineStep(); if (e->key()==Qt::Key_Right) { scrollBy(dx,0); e->accept(); } else if (e->key()==Qt::Key_Left) { scrollBy(0-dx,0); e->accept(); } else if (e->key()==Qt::Key_Up) { scrollBy(0,0-dy); e->accept(); } else if (e->key()==Qt::Key_Down) { scrollBy(0,dy); e->accept(); } else { e->ignore(); } QScrollView::keyPressEvent(e); } void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph) { int w = clipw; int h = cliph; int x = clipx; int y = clipy; bool erase = false; if (!_pdata.size().isValid()) { p->fillRect(clipx,clipy,clipw,cliph, backgroundColor()); return; } + if (w>_pdata.width()) { w=_pdata.width(); x = 0; erase = true; } else if (x+w>_pdata.width()){ x = _pdata.width()-w; } + if (h>_pdata.height()) { h=_pdata.height(); y = 0; erase = true; } else if (y+h>_pdata.height()){ y = _pdata.height()-h; } - if (erase||_original_data.hasAlphaBuffer()) { + + if (erase||_original_data.hasAlphaBuffer()||clipy>_pdata.height()||clipx>_pdata.width()) { + odebug << QSize(clipx,clipy) << " # " << QSize(clipw,cliph) << oendl; p->fillRect(clipx,clipy,clipw,cliph, backgroundColor()); } - p->drawPixmap(clipx,clipy,_pdata,x,y,w,h); + odebug << QSize(x,y) << " - " << QSize(w,h) << oendl; + if (clipy<=_pdata.height()&&clipx<=_pdata.width()) { +#if 0 + odebug << "painting image content" << oendl; +#endif + p->drawPixmap(clipx,clipy,_pdata,x,y,w,h); + } +#if 0 +else { + odebug << "not painting image content" << oendl; + } +#endif } /* using the real geometry points and not the translated points is wanted! */ void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) { int mx, my; mx = e->x(); my = e->y(); if (_mouseStartPosX!=-1 && _mouseStartPosY!=-1) { int diffx = _mouseStartPosX-mx; int diffy = _mouseStartPosY-my; scrollBy(diffx,diffy); } _mouseStartPosX=mx; _mouseStartPosY=my; } void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e) { odebug << " X and Y " << e->x() << " " << e->y() << oendl; /* this marks the beginning of a possible mouse move. Due internal reasons of QT the geometry values here may real differ from that set in MoveEvent (I don't know why). For getting them in real context, we use the first move-event to set the start position ;) */ _mouseStartPosX = -1; _mouseStartPosY = -1; } void OImageScrollView::setDestructiveClose() { WFlags fl = getWFlags(); /* clear it just in case */ fl &= ~WDestructiveClose; fl |= WDestructiveClose; setWFlags( fl ); } bool OImageScrollView::image_fit_into(const QSize&s ) { if (s.width()>width()||s.height()>height()) { return false; } return true; } void OImageScrollView::setShowZoomer(bool how) { m_states.setBit(SHOW_ZOOMER,how); check_zoomer(); } bool OImageScrollView::ShowZoomer()const { return m_states.testBit(SHOW_ZOOMER); } void OImageScrollView::check_zoomer() { if (!_zoomer) return; if ( (!ShowZoomer()||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) { _zoomer->hide(); } else if ( ShowZoomer() && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){ _zoomer->show(); } } bool OImageScrollView::FirstResizeDone()const { return m_states.testBit(FIRST_RESIZE_DONE); } void OImageScrollView::setFirstResizeDone(bool how) { m_states.setBit(FIRST_RESIZE_DONE,how); } bool OImageScrollView::ImageIsJpeg()const { return m_states.testBit(IMAGE_IS_JPEG); } void OImageScrollView::setImageIsJpeg(bool how) { m_states.setBit(IMAGE_IS_JPEG,how); } bool OImageScrollView::ImageScaledLoaded()const { return m_states.testBit(IMAGE_SCALED_LOADED); } void OImageScrollView::setImageScaledLoaded(bool how) { m_states.setBit(IMAGE_SCALED_LOADED,how); } } // namespace MM } // namespace Opie |