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
@@ -397,17 +397,16 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     static int startY = 0;
     static bool block = true;
     switch (me->type())  {
     case QEvent::MouseButtonPress:
         //qDebug("QEvent::MouseButtonPress: ");
         //        kdDebug() << "koagenda: filtered button press" << endl;
         if (object != viewport()) {
             if (me->button() == RightButton) {
-        
                 mClickedItem = (KOAgendaItem *)object;
                 if (mClickedItem) {
                     selectItem(mClickedItem);
                     // emit showIncidencePopupSignal(mClickedItem->incidence());
                 }
                 //mItemPopup->popup(QCursor::pos());
             } else {
                 mActionItem = (KOAgendaItem *)object;
@@ -449,26 +448,37 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 
     case QEvent::MouseButtonRelease:
         //qDebug("QEvent::MouseButtonRelease: %d",blockNewEvent );
         if (me->button() == RightButton && blockNewEvent && !block) {
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
             int gx,gy;
             contentsToGrid(x,y,gx,gy);
-            if ( mCurrentCellY < mStartCellY +1 ) {
-                //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY);
-                mCurrentCellX = gx;
-                mCurrentCellY = gy;
-                mStartCellX = gx;
-                mStartCellY = gy;
-                mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
-                break;
+            if ( object == viewport() ) {
+                if (  mCurrentCellY < mStartCellY +1 ) {
+                    //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY);
+                    mCurrentCellX = gx;
+                    mCurrentCellY = gy;
+                    mStartCellX = gx;
+                    mStartCellY = gy;
+                    mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
+                    break;
+                } else {
+                    blockNewEvent = false;
+                }
             } else {
-                blockNewEvent = false;
+                mClickedItem = (KOAgendaItem *)object;
+                if (mActionItem ) {
+                    endItemAction();
+                }
+                if (mClickedItem) {
+                    selectItem(mClickedItem);
+                    emit showIncidencePopupSignal(mClickedItem->incidence());
+                } 
             }
         } else if (me->button() == RightButton && block ) {
             if (object != viewport()) {
                 mClickedItem = (KOAgendaItem *)object;
                 if (mActionItem ) {
                     endItemAction();
                 }
                 if (mClickedItem) {