| author | zautrix <zautrix> | 2005-02-17 09:44:18 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-02-17 09:44:18 (UTC) |
| commit | d9565b4258279d70fa651e7e6ebe072c0f3755d6 (patch) (unidiff) | |
| tree | 3d4aeffd7983b34f9e32392a7e855feb6ce52dde | |
| parent | 311181f1415625529db49ae73c6ee0b86e3ce86b (diff) | |
| download | kdepimpi-d9565b4258279d70fa651e7e6ebe072c0f3755d6.zip kdepimpi-d9565b4258279d70fa651e7e6ebe072c0f3755d6.tar.gz kdepimpi-d9565b4258279d70fa651e7e6ebe072c0f3755d6.tar.bz2 | |
popup agenda fix
| -rw-r--r-- | korganizer/koagenda.cpp | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index ffa2678..a72e470 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
| @@ -403,5 +403,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
| 403 | if (object != viewport()) { | 403 | if (object != viewport()) { |
| 404 | if (me->button() == RightButton) { | 404 | if (me->button() == RightButton) { |
| 405 | |||
| 406 | mClickedItem = (KOAgendaItem *)object; | 405 | mClickedItem = (KOAgendaItem *)object; |
| 407 | if (mClickedItem) { | 406 | if (mClickedItem) { |
| @@ -455,14 +454,25 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
| 455 | int gx,gy; | 454 | int gx,gy; |
| 456 | contentsToGrid(x,y,gx,gy); | 455 | contentsToGrid(x,y,gx,gy); |
| 457 | if ( mCurrentCellY < mStartCellY +1 ) { | 456 | if ( object == viewport() ) { |
| 458 | //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); | 457 | if ( mCurrentCellY < mStartCellY +1 ) { |
| 459 | mCurrentCellX = gx; | 458 | //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); |
| 460 | mCurrentCellY = gy; | 459 | mCurrentCellX = gx; |
| 461 | mStartCellX = gx; | 460 | mCurrentCellY = gy; |
| 462 | mStartCellY = gy; | 461 | mStartCellX = gx; |
| 463 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); | 462 | mStartCellY = gy; |
| 464 | break; | 463 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); |
| 464 | break; | ||
| 465 | } else { | ||
| 466 | blockNewEvent = false; | ||
| 467 | } | ||
| 465 | } else { | 468 | } else { |
| 466 | blockNewEvent = false; | 469 | mClickedItem = (KOAgendaItem *)object; |
| 470 | if (mActionItem ) { | ||
| 471 | endItemAction(); | ||
| 472 | } | ||
| 473 | if (mClickedItem) { | ||
| 474 | selectItem(mClickedItem); | ||
| 475 | emit showIncidencePopupSignal(mClickedItem->incidence()); | ||
| 476 | } | ||
| 467 | } | 477 | } |
| 468 | } else if (me->button() == RightButton && block ) { | 478 | } else if (me->button() == RightButton && block ) { |