Use MouseEvent instead of vector2i in HoverOnScene

Signed-off-by: ahcorde <[email protected]>
gazebosim · Aug 19, 2021 · f929e7e · f929e7e
1 parent 5d689c7
commit f929e7e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/include/ignition/gui/GuiEvents.hh b/include/ignition/gui/GuiEvents.hh
@@ -331,15 +331,15 @@ namespace ignition
         /// \brief Constructor
         /// \param[in] _point The point at which the mouse is hovering within
         /// the scene
-        public: explicit HoverOnScene(const math::Vector2i &_point);
+        public: explicit HoverOnScene(const common::MouseEvent &_mouse);
 
         /// \brief Unique type for this event.
         static const QEvent::Type kType = QEvent::Type(QEvent::MaxUser - 13);
 
         /// \brief Get the point within the scene over which the user is
         /// hovering.
         /// \return The 2D point
-        public: math::Vector2i Point() const;
+        public: common::MouseEvent Mouse() const;
 
         /// \internal
         /// \brief Private data pointer

diff --git a/src/GuiEvents.cc b/src/GuiEvents.cc
@@ -52,7 +52,7 @@ class ignition::gui::events::HoverToScene::Implementation
 class ignition::gui::events::HoverOnScene::Implementation
 {
   /// \brief The 2D point over which the user is hovering.
-  public: math::Vector2i point;
+  public: common::MouseEvent mouse;
 };
 
 class ignition::gui::events::LeftClickToScene::Implementation
@@ -177,16 +177,16 @@ math::Vector3d HoverToScene::Point() const
 }
 
 /////////////////////////////////////////////////
-HoverOnScene::HoverOnScene(const math::Vector2i &_point)
+HoverOnScene::HoverOnScene(const common::MouseEvent &_mouse)
     : QEvent(kType), dataPtr(utils::MakeImpl<Implementation>())
 {
-  this->dataPtr->point = _point;
+  this->dataPtr->mouse = _mouse;
 }
 
 /////////////////////////////////////////////////
-math::Vector2i HoverOnScene::Point() const
+common::MouseEvent HoverOnScene::Mouse() const
 {
-  return this->dataPtr->point;
+  return this->dataPtr->mouse;
 }
 
 /////////////////////////////////////////////////

diff --git a/src/GuiEvents_TEST.cc b/src/GuiEvents_TEST.cc
@@ -72,10 +72,20 @@ TEST(GuiEventsTest, HoverToScene)
 /////////////////////////////////////////////////
 TEST(GuiEventsTest, HoverOnScene)
 {
-  events::HoverOnScene event({1, 2});
+
+  ignition::common::MouseEvent mouse;
+  mouse.SetAlt(true);
+  mouse.SetShift(true);
+  mouse.SetDragging(false);
+  mouse.SetType(common::MouseEvent::MOVE);
+  events::HoverOnScene event(mouse);
 
   EXPECT_LT(QEvent::User, event.type());
-  EXPECT_EQ(math::Vector2i(1, 2), event.Point());
+  EXPECT_FALSE(event.Mouse().Control());
+  EXPECT_FALSE(event.Mouse().Dragging());
+  EXPECT_EQ(event.Mouse().Type(), common::MouseEvent::MOVE);
+  EXPECT_TRUE(event.Mouse().Alt());
+  EXPECT_TRUE(event.Mouse().Shift());
 }
 
 /////////////////////////////////////////////////

diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc
@@ -203,7 +203,12 @@ void IgnRenderer::BroadcastHoverPos()
 
   events::HoverToScene hoverToSceneEvent(pos);
   App()->sendEvent(App()->findChild<MainWindow *>(), &hoverToSceneEvent);
-  events::HoverOnScene hoverOnSceneEvent(this->dataPtr->mouseHoverPos);
+
+  common::MouseEvent hoverMouseEvent = this->dataPtr->mouseEvent;
+  hoverMouseEvent.SetPos(this->dataPtr->mouseHoverPos);
+  hoverMouseEvent.SetDragging(false);
+  hoverMouseEvent.SetType(common::MouseEvent::MOVE);
+  events::HoverOnScene hoverOnSceneEvent(hoverMouseEvent);
   App()->sendEvent(App()->findChild<MainWindow *>(), &hoverOnSceneEvent);
 }