1 files changed, 45 insertions, 6 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index deadfc9..de964da 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -169,5 +169,5 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
 {
    
-
+    mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
@@ -188,4 +188,5 @@ KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
+    mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
@@ -388,4 +389,6 @@ void KOAgenda::popupMenu()
         if (mPopupItem) {
             selectItem(mPopupItem);
+            if ( mAllAgendaPopup )
+                mAllAgendaPopup->installEventFilter( this );
             emit showIncidencePopupSignal(mPopupItem->incidence());
             
@@ -396,5 +399,7 @@ void KOAgenda::popupMenu()
             mLeftMouseDown = false; // no more leftMouse computation
         }
+        mNewItemPopup->installEventFilter( this );
         mNewItemPopup->popup( mPopupPos);
+        
     }
     mLeftMouseDown = false;
@@ -405,5 +410,42 @@ void KOAgenda::popupMenu()
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
+    static int startX = 0;
+    static int startY = 0;
+    static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
+    static bool blockMoving = true;
+
  //qDebug("KOAgenda::eventFilter_mous ");
+    if ( object == mNewItemPopup ) {
+        //qDebug("mNewItemPopup ");
+        if ( me->type() == QEvent::MouseButtonRelease ) {
+            mNewItemPopup->removeEventFilter( this ); 
+            int dX = me->globalPos().x() - mPopupPos.x();;
+            if ( dX < 0   )
+                dX = -dX;
+            int dY =  me->globalPos().y() - mPopupPos.y();
+            if ( dY < 0 )
+                dY = -dY;
+            if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
+                mNewItemPopup->hide();
+            }
+        }
+        return true;
+    }
+    if ( object == mAllAgendaPopup ) {
+        //qDebug(" mAllAgendaPopup ");
+        if ( me->type() == QEvent::MouseButtonRelease ) {
+            mAllAgendaPopup->removeEventFilter( this );
+            int dX = me->globalPos().x() - mPopupPos.x();;
+            if ( dX < 0   )
+                dX = -dX;
+            int dY =  me->globalPos().y() - mPopupPos.y();
+            if ( dY < 0 )
+                dY = -dY;
+            if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
+                mAllAgendaPopup->hide();
+            } 
+        }
+        return true;
+    }
     QPoint viewportPos;
     if (object != viewport()) {
@@ -412,8 +454,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         viewportPos = me->pos();
     }
-    static int startX = 0;
-    static int startY = 0;
-    static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
-    static bool blockMoving = true;
+    
     switch (me->type())  {
     case QEvent::MouseButtonPress:
@@ -425,4 +464,5 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         startX = viewportPos.x();
         startY = viewportPos.y(); 
+        mPopupPos = me->globalPos();
         if (object != viewport()) {
             mPopupItem = (KOAgendaItem *)object;
@@ -456,5 +496,4 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             selectItem(0);
             mActionItem = 0;   
-            mPopupPos =  viewport()->mapToGlobal( me->pos() );
             if (me->button() == RightButton) {
                 int x,y;