agenda mouse fix

1 files changed, 11 insertions, 4 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 8c2996b..dcb46a8 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -130,97 +130,97 @@ void MarcusBains::updateLocation(bool recalculate)
         hide(); mTimeBox->hide();
         return;
     } else {
         show(); mTimeBox->show();
     }
 
     if(recalculate)
         setFixedSize(agenda->gridSpacingX(),1);
     agenda->moveChild(this, x, y);
     raise();
 
     if(recalculate)
         //mTimeBox->setFont(QFont("helvetica",10));
       mTimeBox->setFont(KOPrefs::instance()->mMarcusBainsFont);
 
     mTimeBox->setText(KGlobal::locale()->formatTime(tim, KOPrefs::instance()->mMarcusBainsShowSeconds));
     mTimeBox->adjustSize();
     // the -2 below is there because there is a bug in this program
     // somewhere, where the last column of this widget is a few pixels
     // narrower than the other columns.
     int offs = (today==agenda->columns()-1) ? -4 : 0;
     agenda->moveChild(mTimeBox,
                x+agenda->gridSpacingX()-mTimeBox->width()+offs-1,
                   y-mTimeBox->height());
  
     mTimeBox->raise();
     //mTimeBox->setAutoMask(true);
     minutes->start(5000,true);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////
 
 
 /*
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
                    const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
    
 
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
-  QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
+  //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 /*
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
 KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
   mGridSpacingY = KOPrefs::instance()->mAllDaySize;
   mAllDayMode = true;
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 
 KOAgenda::~KOAgenda()
 {
     if(mMarcusBains) delete mMarcusBains;
     
 }
 
 Incidence *KOAgenda::selectedIncidence() const
 {
   return (mSelectedItem ? mSelectedItem->incidence() : 0);
 }
 
 
 QDate KOAgenda::selectedIncidenceDate() const
 {
   return (mSelectedItem ? mSelectedItem->itemDate() : QDate());
 }
 
 
 void KOAgenda::init()
 {  
     mNewItemPopup = new QPopupMenu( this );
     connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
@@ -354,178 +354,185 @@ void KOAgenda::changeColumns(int columns)
 //  update();
   //qDebug("KOAgenda::changeColumns ");
     computeSizes();
     // QResizeEvent event( size(), size() );
 
     //QApplication::sendEvent( this, &event );
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
 //  kdDebug() << "KOAgenda::eventFilter" << endl;
   switch(event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
       return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
       if (!mActionItem)
         setCursor(arrowCursor);
       return true;
 
     default:
       return QScrollView::eventFilter(object,event);
   }
 }
 
 
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
     //qDebug("KOAgenda::eventFilter_mous ");
     QPoint viewportPos;
     if (object != viewport()) {
         viewportPos = ((QWidget *)object)->mapToParent(me->pos());
     } else {
         viewportPos = me->pos();
     }
     static int startX = 0;
     static int startY = 0;
     static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
     static bool blockMoving = true;
     static bool leftMouseDown = false;
     static bool rightMouseDown = false;
+    static QTime rightClickTime;
+    bool rightButtonPressed = false;
     switch (me->type())  {
     case QEvent::MouseButtonPress:
-        if (me->button() == LeftButton) 
+        rightClickTime.restart();
+        if (me->button() == LeftButton) {
             leftMouseDown = true;
+        }
         else if (me->button() == RightButton) 
             rightMouseDown = true;
         blockMoving = true;
         startX = viewportPos.x();
         startY = viewportPos.y(); 
         if (object != viewport()) {
             if (me->button() == RightButton) {
                 mClickedItem = (KOAgendaItem *)object;
                 if (mClickedItem) {
                     selectItem(mClickedItem);
                 }
             } else if (me->button() == LeftButton) {
                 mActionItem = (KOAgendaItem *)object;
                 if (mActionItem) {
                     if ( mSelectionHeight > 0 ) { 
                         int selectionCellX = mSelectionCellX * mGridSpacingX;
                         int selectionYTop = mSelectionYTop;
                         int gridSpacingX = mGridSpacingX;
                         int selectionHeight = mSelectionHeight;
                         clearSelection();
                         repaintContents( selectionCellX, selectionYTop,
                                          gridSpacingX, selectionHeight,false );
                     }
                     selectItem(mActionItem);
                     Incidence *incidence = mActionItem->incidence();
                     if ( incidence->isReadOnly() /*|| incidence->recurrence()->doesRecur() */) {
                         mActionItem = 0;
                     } else {
                         startItemAction(viewportPos);
                     }
                 }
             }
         } else { // ---------- viewport()
             selectItem(0);
             mActionItem = 0;
             if (me->button() == LeftButton ) {
                 setCursor(arrowCursor);
                 startSelectAction(viewportPos);
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
+        if (  rightClickTime.elapsed() > 700 &&  blockMoving )
+            rightButtonPressed = true;
         if (object != viewport()) { 
-            if (me->button() == RightButton) {
+            if (me->button() == RightButton  || rightButtonPressed ) {
                 if ( blockMoving ) {
                     mClickedItem = (KOAgendaItem *)object;
                     if (mActionItem ) {
                         endItemAction();
                     }
                     leftMouseDown = false; // no more leftMouse computation
                     if (mClickedItem) {
                         selectItem(mClickedItem);
                         emit showIncidencePopupSignal(mClickedItem->incidence());
                     } 
                 }
             } else if (me->button() == LeftButton && leftMouseDown) {
                 if (mActionItem) {  
                     QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
                     //qDebug(" %d %d %d  ",clipperPos.y(),visibleHeight() , 9  );
                     if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
                         mScrollUpTimer.stop();
                         mScrollDownTimer.stop();
                         mActionItem->resetMove();
                         placeSubCells( mActionItem );
                         // emit startDragSignal( mActionItem->incidence() );
                         setCursor( arrowCursor );
                         mActionItem = 0;
                         mActionType = NOP;
                         mItemMoved = 0;
+                        leftMouseDown = false;
                         return true;
                     }
                     endItemAction();
                 }
             }
             
         } else { // ---------- viewport()
-            if (me->button() == RightButton) { //right click
+            if (me->button() == RightButton || rightButtonPressed ) { //right click
                 if ( blockMoving ) { // we did mot moved the mouse much - popup menu
                     if ( leftMouseDown ) { // we have a simulated right click - clear left mouse action
                         endSelectAction( false ); // do not emit new event signal
                         leftMouseDown = false; // no more leftMouse computation
                     }
                     int x,y;
                     viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
                     int gx,gy;
                     contentsToGrid(x,y,gx,gy); 
                     mCurrentCellX = gx;
                     mCurrentCellY = gy;
                     mStartCellX = gx;
                     mStartCellY = gy;
                     mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
                 }
             }
             else if (me->button() == LeftButton && leftMouseDown ) { //left click
                 endSelectAction( true ); // emit new event signal
             }
         }
         if (me->button() == LeftButton) 
             leftMouseDown = false;
         else if (me->button() == RightButton) 
             rightMouseDown = false;
         break;
 
     case QEvent::MouseMove:
         if ( !rightMouseDown && !leftMouseDown )
             return true;
         if ( blockMoving ) {
             int dX, dY; 
             dX = startX - viewportPos.x();
             if ( dX < 0   )
                 dX = -dX;
             dY = viewportPos.y() - startY;
             if ( dY < 0 )
                 dY = -dY;
             //qDebug("%d %d %d ", dX, dY , blockmoveDist  );
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 blockMoving = false;
             }
         }
         if (object != viewport()) {
             KOAgendaItem *moveItem = (KOAgendaItem *)object;
             if (!moveItem->incidence()->isReadOnly()  ) {
                 if (!mActionItem)
                     setNoActionCursor(moveItem,viewportPos);
                 else {