-rw-r--r-- | korganizer/koagenda.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 99009a5..cdeeac5 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -410,13 +410,13 @@ void KOAgenda::popupMenu() | |||
410 | } | 410 | } |
411 | 411 | ||
412 | bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | 412 | bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) |
413 | { | 413 | { |
414 | static int startX = 0; | 414 | static int startX = 0; |
415 | static int startY = 0; | 415 | static int startY = 0; |
416 | static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 ); | 416 | int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 ); |
417 | static bool blockMoving = true; | 417 | static bool blockMoving = true; |
418 | 418 | ||
419 | //qDebug("KOAgenda::eventFilter_mous "); | 419 | //qDebug("KOAgenda::eventFilter_mous "); |
420 | if ( object == mNewItemPopup ) { | 420 | if ( object == mNewItemPopup ) { |
421 | //qDebug("mNewItemPopup "); | 421 | //qDebug("mNewItemPopup "); |
422 | if ( me->type() == QEvent::MouseButtonRelease ) { | 422 | if ( me->type() == QEvent::MouseButtonRelease ) { |
@@ -448,12 +448,13 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
448 | } | 448 | } |
449 | } | 449 | } |
450 | return true; | 450 | return true; |
451 | } | 451 | } |
452 | QPoint viewportPos; | 452 | QPoint viewportPos; |
453 | if (object != viewport()) { | 453 | if (object != viewport()) { |
454 | blockmoveDist = blockmoveDist*2; | ||
454 | viewportPos = ((QWidget *)object)->mapToParent(me->pos()); | 455 | viewportPos = ((QWidget *)object)->mapToParent(me->pos()); |
455 | } else { | 456 | } else { |
456 | viewportPos = me->pos(); | 457 | viewportPos = me->pos(); |
457 | } | 458 | } |
458 | 459 | ||
459 | switch (me->type()) { | 460 | switch (me->type()) { |
@@ -467,13 +468,13 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
467 | startY = viewportPos.y(); | 468 | startY = viewportPos.y(); |
468 | mPopupPos = me->globalPos(); | 469 | mPopupPos = me->globalPos(); |
469 | if (object != viewport()) { | 470 | if (object != viewport()) { |
470 | mPopupItem = (KOAgendaItem *)object; | 471 | mPopupItem = (KOAgendaItem *)object; |
471 | mPopupKind = 1; | 472 | mPopupKind = 1; |
472 | if (me->button() == RightButton) { | 473 | if (me->button() == RightButton) { |
473 | mPopupKind = 3; | 474 | mPopupKind = 3; |
474 | popupMenu(); | 475 | popupMenu(); |
475 | } else if (me->button() == LeftButton) { | 476 | } else if (me->button() == LeftButton) { |
476 | mActionItem = (KOAgendaItem *)object; | 477 | mActionItem = (KOAgendaItem *)object; |
477 | if (mActionItem) { | 478 | if (mActionItem) { |
478 | emit signalClearSelection(); | 479 | emit signalClearSelection(); |
479 | slotClearSelection(); | 480 | slotClearSelection(); |
@@ -497,13 +498,13 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
497 | int gx,gy; | 498 | int gx,gy; |
498 | contentsToGrid(x,y,gx,gy); | 499 | contentsToGrid(x,y,gx,gy); |
499 | mCurrentCellX = gx; | 500 | mCurrentCellX = gx; |
500 | mCurrentCellY = gy; | 501 | mCurrentCellY = gy; |
501 | mStartCellX = gx; | 502 | mStartCellX = gx; |
502 | mStartCellY = gy; | 503 | mStartCellY = gy; |
503 | mPopupKind = 4; | 504 | mPopupKind = 4; |
504 | popupMenu(); | 505 | popupMenu(); |
505 | } else if (me->button() == LeftButton) { | 506 | } else if (me->button() == LeftButton) { |
506 | setCursor(arrowCursor); | 507 | setCursor(arrowCursor); |
507 | startSelectAction(viewportPos); | 508 | startSelectAction(viewportPos); |
508 | } | 509 | } |
509 | } | 510 | } |