fix rubberband when a click happened during left mouse holding

qgis · Feb 1, 2022 · 4f52108 · 4f52108
1 parent 68a0c93
commit 4f52108
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/gui/layout/qgslayoutviewtoolselect.cpp b/src/gui/layout/qgslayoutviewtoolselect.cpp
@@ -67,6 +67,13 @@ void QgsLayoutViewToolSelect::layoutPressEvent( QgsLayoutViewMouseEvent *event )
 
   if ( event->button() != Qt::LeftButton )
   {
+    if ( mIsSelecting )
+    {
+      // selection must be ended if a right button press happens, otherwise selection rubberband won't be suppress
+      QMouseEvent leftRelease( QMouseEvent::MouseButtonRelease, event->localPos(), Qt::LeftButton, event->buttons(), event->modifiers() );
+      QgsLayoutViewMouseEvent layoutLeftRelease( view(), &leftRelease );
+      layoutReleaseEvent( &layoutLeftRelease );
+    }
     event->ignore();
     return;
   }

diff --git a/src/gui/layout/qgslayoutviewtoolzoom.cpp b/src/gui/layout/qgslayoutviewtoolzoom.cpp
@@ -33,6 +33,11 @@ void QgsLayoutViewToolZoom::layoutPressEvent( QgsLayoutViewMouseEvent *event )
 {
   if ( event->button() != Qt::LeftButton )
   {
+    if ( mMarqueeZoom )
+    {
+      mMarqueeZoom = false;
+      mRubberBand->finish();
+    }
     event->ignore();
     return;
   }