Do not show RMB menus if we're dragging an annotation

remotes/origin/Applications/15.04
Albert Astals Cid 11 years ago
parent ded1e5486d
commit 4ab459790b
  1. 4
      ui/pageview.cpp

@ -2125,7 +2125,7 @@ void PageView::mousePressEvent( QMouseEvent * e )
d->leftClickTimer.start( QApplication::doubleClickInterval() + 10 ); d->leftClickTimer.start( QApplication::doubleClickInterval() + 10 );
} }
} }
else if ( rightButton ) else if ( rightButton && !d->mouseAnn )
{ {
PageViewItem * pageItem = pickItemOnPoint( eventPos.x(), eventPos.y() ); PageViewItem * pageItem = pickItemOnPoint( eventPos.x(), eventPos.y() );
if ( pageItem ) if ( pageItem )
@ -2414,7 +2414,7 @@ void PageView::mouseReleaseEvent( QMouseEvent * e )
#endif #endif
} }
} }
else if ( rightButton ) else if ( rightButton && !d->mouseAnn )
{ {
if ( pageItem && pageItem == pageItemPressPos && if ( pageItem && pageItem == pageItemPressPos &&
( (d->mousePressPos - e->globalPos()).manhattanLength() < QApplication::startDragDistance() ) ) ( (d->mousePressPos - e->globalPos()).manhattanLength() < QApplication::startDragDistance() ) )

Loading…
Cancel
Save