summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
@@ -432,65 +432,64 @@ void OImageScrollView::keyPressEvent(QKeyEvent * e)
432 } 432 }
433 QScrollView::keyPressEvent(e); 433 QScrollView::keyPressEvent(e);
434} 434}
435 435
436void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph) 436void OImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
437{ 437{
438 if (!_pdata.size().isValid()) { 438 if (!_pdata.size().isValid()) {
439 p->fillRect(clipx,clipy,clipw,cliph, backgroundColor()); 439 p->fillRect(clipx,clipy,clipw,cliph, backgroundColor());
440 return; 440 return;
441 } 441 }
442 442
443 int w = clipw; 443 int w = clipw;
444 int h = cliph; 444 int h = cliph;
445 int x = clipx; 445 int x = clipx;
446 int y = clipy; 446 int y = clipy;
447 bool erase = false; 447 bool erase = false;
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;
481 _mouseStartPosY=my; 480 _mouseStartPosY=my;
482} 481}
483 482
484void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e) 483void OImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
485{ 484{
486 odebug << " X and Y " << e->x() << " " << e->y() << oendl; 485 odebug << " X and Y " << e->x() << " " << e->y() << oendl;
487 /* this marks the beginning of a possible mouse move. Due internal reasons of QT 486 /* this marks the beginning of a possible mouse move. Due internal reasons of QT
488 the geometry values here may real differ from that set in MoveEvent (I don't know 487 the geometry values here may real differ from that set in MoveEvent (I don't know
489 why). For getting them in real context, we use the first move-event to set the start 488 why). For getting them in real context, we use the first move-event to set the start
490 position ;) 489 position ;)
491 */ 490 */
492 _mouseStartPosX = -1; 491 _mouseStartPosX = -1;
493 _mouseStartPosY = -1; 492 _mouseStartPosY = -1;
494} 493}
495 494
496void OImageScrollView::setDestructiveClose() { 495void OImageScrollView::setDestructiveClose() {