author | zautrix <zautrix> | 2005-06-28 11:19:58 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-28 11:19:58 (UTC) |
commit | 5861dc779cce151b7a05f3295ca11ffbf39e5a20 (patch) (unidiff) | |
tree | f9d2a06cd171f4269e7597fbc44afb76b8ff76b1 /korganizer | |
parent | c26c9e0aa8c8a3b1d3e8dba018d56dbdb67c65b4 (diff) | |
download | kdepimpi-5861dc779cce151b7a05f3295ca11ffbf39e5a20.zip kdepimpi-5861dc779cce151b7a05f3295ca11ffbf39e5a20.tar.gz kdepimpi-5861dc779cce151b7a05f3295ca11ffbf39e5a20.tar.bz2 |
fix
-rw-r--r-- | korganizer/koagenda.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index faddac4..ce73168 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -471,18 +471,22 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
471 | startX = viewportPos.x(); | 471 | startX = viewportPos.x(); |
472 | startY = viewportPos.y(); | 472 | startY = viewportPos.y(); |
473 | mPopupPos = me->globalPos(); | 473 | mPopupPos = me->globalPos(); |
474 | if ( objIsNotViewport && !leftButt ) { | 474 | if ( objIsNotViewport && !leftButt ) { |
475 | KOAgendaItem * tempItem = (KOAgendaItem *)object; | 475 | KOAgendaItem * tempItem = (KOAgendaItem *)object; |
476 | if (mAllDayMode) { | 476 | if (mAllDayMode) { |
477 | if ( tempItem->height() > 10 ) { | 477 | if ( tempItem->height() > 10 ) { |
478 | int minV = tempItem->height()/4; | 478 | int minV = tempItem->height()/4; |
479 | if ( minV > (blockmoveDist/2)-2 ) | 479 | if ( minV > (blockmoveDist/2)-2 ) { |
480 | minV = (blockmoveDist/2)-2; | 480 | if ( minV > blockmoveDist ) |
481 | minV = blockmoveDist; | ||
482 | else | ||
483 | minV = (blockmoveDist/2); | ||
484 | } | ||
481 | bool border = false; | 485 | bool border = false; |
482 | int diff = tempItem->y() - viewportPos.y(); | 486 | int diff = tempItem->y() - viewportPos.y(); |
483 | if ( diff < 0 ) | 487 | if ( diff < 0 ) |
484 | diff *= -1; | 488 | diff *= -1; |
485 | if ( diff < minV ) { | 489 | if ( diff < minV ) { |
486 | border = true; | 490 | border = true; |
487 | objIsNotViewport = false; | 491 | objIsNotViewport = false; |
488 | } | 492 | } |
@@ -494,18 +498,22 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
494 | border = true; | 498 | border = true; |
495 | objIsNotViewport = false; | 499 | objIsNotViewport = false; |
496 | } | 500 | } |
497 | } | 501 | } |
498 | } | 502 | } |
499 | } else { // not allday | 503 | } else { // not allday |
500 | if ( tempItem->width() > 10 ) { | 504 | if ( tempItem->width() > 10 ) { |
501 | int minH = tempItem->width()/4; | 505 | int minH = tempItem->width()/4; |
502 | if ( minH > (blockmoveDist/2)-2 ) | 506 | if ( minH > (blockmoveDist/2)-2 ) { |
503 | minH = (blockmoveDist/2)-2; | 507 | if ( minH > blockmoveDist ) |
508 | minH = blockmoveDist; | ||
509 | else | ||
510 | minH = (blockmoveDist/2); | ||
511 | } | ||
504 | bool border = false; | 512 | bool border = false; |
505 | int diff = tempItem->x() - viewportPos.x(); | 513 | int diff = tempItem->x() - viewportPos.x(); |
506 | if ( diff < 0 ) | 514 | if ( diff < 0 ) |
507 | diff *= -1; | 515 | diff *= -1; |
508 | if ( diff < minH ) { | 516 | if ( diff < minH ) { |
509 | border = true; | 517 | border = true; |
510 | objIsNotViewport = false; | 518 | objIsNotViewport = false; |
511 | } | 519 | } |