Commit 4ab45979 authored by Albert Astals Cid's avatar Albert Astals Cid

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

parent ded1e548
......@@ -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() ) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment