Make sure all targets receive the mouse release event

Author: adazem009

ScratchCPPGui/mouseeventhandler.cpp

@@ -57,7 +57,13 @@ bool MouseEventHandler::eventFilter(QObject *obj, QEvent *event)
 
         case QEvent::MouseButtonRelease:
             emit mouseReleased();
-            forwardPointEvent(static_cast<QSinglePointEvent *>(event));
+
+            if (m_clickedItem) {
+                sendPointEventToItem(static_cast<QSinglePointEvent *>(event), m_clickedItem);
+                m_clickedItem = nullptr;
+            } else
+                forwardPointEvent(static_cast<QSinglePointEvent *>(event));
+
             return true;
 
         default:
@@ -137,6 +143,9 @@ void MouseEventHandler::sendPointEventToItem(QSinglePointEvent *event, QQuickIte
         case QEvent::MouseButtonPress:
         case QEvent::MouseButtonRelease:
         case QEvent::MouseMove: {
+            if (event->type() == QEvent::MouseButtonPress)
+                m_clickedItem = item;
+
             QMouseEvent itemEvent(
                 event->type(),
                 item->mapFromScene(event->scenePosition()),

ScratchCPPGui/mouseeventhandler.h

@@ -40,6 +40,7 @@ class MouseEventHandler : public QObject
 
         IRenderedTarget *m_stage = nullptr;
         QQuickItem *m_hoveredItem = nullptr;
+        QQuickItem *m_clickedItem = nullptr;
         QQuickItem *m_spriteRepeater = nullptr;
 };
 

test/mouseeventhandler/mouseeventhandler_test.cpp

@@ -303,17 +303,32 @@ TEST(MouseEventHandlerTest, MousePressReleaseEvent)
     pressedSpy.clear();
     releasedSpy.clear();
 
-    // Send to stage (press)
+    // Send release (should be sent to sprite 1)
+    EXPECT_CALL(renderedTarget1, mouseReleaseEvent(_)).WillOnce(WithArgs<0>(Invoke(checkReleaseEvent)));
+    ASSERT_TRUE(handler.eventFilter(nullptr, &releaseEvent));
+    ASSERT_EQ(pressedSpy.count(), 0);
+    ASSERT_EQ(releasedSpy.count(), 1);
+    pressedSpy.clear();
+    releasedSpy.clear();
+
+    // Send to sprite 1 (press)
     EXPECT_CALL(renderedTarget3, contains(localPos)).WillOnce(Return(false));
-    EXPECT_CALL(renderedTarget1, contains(localPos)).WillOnce(Return(false));
-    EXPECT_CALL(renderedTarget2, contains(localPos)).WillOnce(Return(false));
-    EXPECT_CALL(stage, mousePressEvent(_)).WillOnce(WithArgs<0>(Invoke(checkPressEvent)));
+    EXPECT_CALL(renderedTarget1, contains(localPos)).WillOnce(Return(true));
+    EXPECT_CALL(renderedTarget1, mousePressEvent(_)).WillOnce(WithArgs<0>(Invoke(checkPressEvent)));
     ASSERT_TRUE(handler.eventFilter(nullptr, &pressEvent));
     ASSERT_EQ(pressedSpy.count(), 1);
     ASSERT_EQ(releasedSpy.count(), 0);
     pressedSpy.clear();
     releasedSpy.clear();
 
+    // Send release (should be sent to sprite 1)
+    EXPECT_CALL(renderedTarget1, mouseReleaseEvent(_)).WillOnce(WithArgs<0>(Invoke(checkReleaseEvent)));
+    ASSERT_TRUE(handler.eventFilter(nullptr, &releaseEvent));
+    ASSERT_EQ(pressedSpy.count(), 0);
+    ASSERT_EQ(releasedSpy.count(), 1);
+    pressedSpy.clear();
+    releasedSpy.clear();
+
     // Send to sprite 1 (release)
     EXPECT_CALL(renderedTarget3, contains(localPos)).WillOnce(Return(false));
     EXPECT_CALL(renderedTarget1, contains(localPos)).WillOnce(Return(true));
@@ -324,10 +339,18 @@ TEST(MouseEventHandlerTest, MousePressReleaseEvent)
     pressedSpy.clear();
     releasedSpy.clear();
 
-    // Send to stage (release)
+    // Send to stage (press)
     EXPECT_CALL(renderedTarget3, contains(localPos)).WillOnce(Return(false));
     EXPECT_CALL(renderedTarget1, contains(localPos)).WillOnce(Return(false));
     EXPECT_CALL(renderedTarget2, contains(localPos)).WillOnce(Return(false));
+    EXPECT_CALL(stage, mousePressEvent(_)).WillOnce(WithArgs<0>(Invoke(checkPressEvent)));
+    ASSERT_TRUE(handler.eventFilter(nullptr, &pressEvent));
+    ASSERT_EQ(pressedSpy.count(), 1);
+    ASSERT_EQ(releasedSpy.count(), 0);
+    pressedSpy.clear();
+    releasedSpy.clear();
+
+    // Send release (should be sent to stage)
     EXPECT_CALL(stage, mouseReleaseEvent(_)).WillOnce(WithArgs<0>(Invoke(checkReleaseEvent)));
     ASSERT_TRUE(handler.eventFilter(nullptr, &releaseEvent));
     ASSERT_EQ(pressedSpy.count(), 0);