Merge 75efa37 into 72e1066

gazebosim · Sep 21, 2021 · f2a8560 · f2a8560
2 parents 72e1066 + 75efa37
commit f2a8560
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc
@@ -431,6 +431,8 @@ void IgnRenderer::BroadcastRightClick()
 
   events::RightClickToScene rightClickToSceneEvent(pos);
   App()->sendEvent(App()->findChild<MainWindow *>(), &rightClickToSceneEvent);
+  events::RightClickOnScene rightClickOnSceneEvent(this->dataPtr->mouseEvent);
+  App()->sendEvent(App()->findChild<MainWindow *>(), &rightClickOnSceneEvent);
 }
 
 
@@ -1051,9 +1053,9 @@ void RenderWindowItem::OnDropped(const QString &_drop,
 /////////////////////////////////////////////////
 void RenderWindowItem::mousePressEvent(QMouseEvent *_e)
 {
-  auto event = convert(*_e);
-  event.SetPressPos(event.Pos());
-  this->dataPtr->mouseEvent = event;
+  auto pressPos = this->dataPtr->mouseEvent.PressPos();
+  this->dataPtr->mouseEvent = convert(*_e);
+  this->dataPtr->mouseEvent.SetPressPos(pressPos);
 
   this->dataPtr->renderThread->ignRenderer.NewMouseEvent(
       this->dataPtr->mouseEvent);
@@ -1083,6 +1085,7 @@ void RenderWindowItem::keyReleaseEvent(QKeyEvent *_e)
 void RenderWindowItem::mouseReleaseEvent(QMouseEvent *_e)
 {
   this->dataPtr->mouseEvent = convert(*_e);
+  this->dataPtr->mouseEvent.SetPressPos(_e->pos().x(), _e->pos().y());
 
   this->dataPtr->renderThread->ignRenderer.NewMouseEvent(
       this->dataPtr->mouseEvent);