summaryrefslogtreecommitdiff
path: root/libopie2
Unidiff
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiemm/oimagescrollview.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp
index 72248c1..56be10b 100644
--- a/libopie2/opiemm/oimagescrollview.cpp
+++ b/libopie2/opiemm/oimagescrollview.cpp
@@ -448,33 +448,32 @@ void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clip
448 448
449 if (w>_pdata.width()) { 449 if (w>_pdata.width()) {
450 w = _pdata.width()-x; 450 w = _pdata.width()-x;
451 erase=true; 451 erase=true;
452 } 452 }
453 if (h>_pdata.height()) { 453 if (h>_pdata.height()) {
454 h = _pdata.height()-y; 454 h = _pdata.height()-y;
455 erase=true; 455 erase=true;
456 } 456 }
457 if (!erase && (clipy+cliph>_pdata.height()||clipx+clipw>_pdata.width())) { 457 if (!erase && (clipy+cliph>_pdata.height()||clipx+clipw>_pdata.width())) {
458 erase = true; 458 erase = true;
459 } 459 }
460 if (erase||_original_data.hasAlphaBuffer()) { 460 if (erase||_original_data.hasAlphaBuffer()) {
461 p->fillRect(clipx,clipy,clipw,cliph, backgroundColor()); 461 p->fillRect(clipx,clipy,clipw,cliph, backgroundColor());
462 } 462 }
463 if (w>0 && h>0&&x<_pdata.width()&&y<_pdata.height()) { 463 if (w>0 && h>0&&x<_pdata.width()&&y<_pdata.height()) {
464 odebug << "Drawing pixmap" << oendl;
465 p->drawPixmap(clipx,clipy,_pdata,x,y,w,h); 464 p->drawPixmap(clipx,clipy,_pdata,x,y,w,h);
466 } 465 }
467} 466}
468 467
469/* using the real geometry points and not the translated points is wanted! */ 468/* using the real geometry points and not the translated points is wanted! */
470void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) 469void OImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
471{ 470{
472 int mx, my; 471 int mx, my;
473 mx = e->x(); 472 mx = e->x();
474 my = e->y(); 473 my = e->y();
475 if (_mouseStartPosX!=-1 && _mouseStartPosY!=-1) { 474 if (_mouseStartPosX!=-1 && _mouseStartPosY!=-1) {
476 int diffx = _mouseStartPosX-mx; 475 int diffx = _mouseStartPosX-mx;
477 int diffy = _mouseStartPosY-my; 476 int diffy = _mouseStartPosY-my;
478 scrollBy(diffx,diffy); 477 scrollBy(diffx,diffy);
479 } 478 }
480 _mouseStartPosX=mx; 479 _mouseStartPosX=mx;