From 4ab459790ba2dd101093a91b27e6bb78ba8d4c4e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 13 Mar 2015 23:44:29 +0100 Subject: [PATCH] Do not show RMB menus if we're dragging an annotation --- ui/pageview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 57d4a1371..1631d9327 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -2125,7 +2125,7 @@ void PageView::mousePressEvent( QMouseEvent * e ) d->leftClickTimer.start( QApplication::doubleClickInterval() + 10 ); } } - else if ( rightButton ) + else if ( rightButton && !d->mouseAnn ) { PageViewItem * pageItem = pickItemOnPoint( eventPos.x(), eventPos.y() ); if ( pageItem ) @@ -2414,7 +2414,7 @@ void PageView::mouseReleaseEvent( QMouseEvent * e ) #endif } } - else if ( rightButton ) + else if ( rightButton && !d->mouseAnn ) { if ( pageItem && pageItem == pageItemPressPos && ( (d->mousePressPos - e->globalPos()).manhattanLength() < QApplication::startDragDistance() ) )