fix #85: Update drag position in beforeRedraw()

Author: adazem009

src/renderedtarget.cpp

@@ -180,6 +180,15 @@ void RenderedTarget::beforeRedraw()
         m_oldTexture = m_texture;
         update();
     }
+
+    // Update drag position
+    if (m_spriteModel) {
+        Sprite *sprite = m_spriteModel->sprite();
+        Q_ASSERT(sprite);
+
+        if (sprite->dragging())
+            sprite->dragToPosition(m_dragX, m_dragY);
+    }
 }
 
 void RenderedTarget::deinitClone()
@@ -758,12 +767,9 @@ void RenderedTarget::handleSceneMouseMove(qreal x, qreal y)
     Q_ASSERT(m_mouseArea);
 
     if (m_mouseArea->draggedSprite() == this) {
-        Q_ASSERT(m_spriteModel && m_spriteModel->sprite());
         Q_ASSERT(m_engine);
-        Sprite *sprite = m_spriteModel->sprite();
-        const double dragX = x / m_stageScale - m_engine->stageWidth() / 2.0 - m_dragDeltaX;
-        const double dragY = -y / m_stageScale + m_engine->stageHeight() / 2.0 - m_dragDeltaY;
-        sprite->dragToPosition(dragX, dragY);
+        m_dragX = x / m_stageScale - m_engine->stageWidth() / 2.0 - m_dragDeltaX;
+        m_dragY = -y / m_stageScale + m_engine->stageHeight() / 2.0 - m_dragDeltaY;
     }
 }
 

src/renderedtarget.h

@@ -168,6 +168,8 @@ class RenderedTarget : public IRenderedTarget
         bool m_convexHullDirty = true;
         std::vector<QPoint> m_hullPoints;
         bool m_clicked = false; // left mouse button only!
+        double m_dragX = 0;
+        double m_dragY = 0;
         double m_dragDeltaX = 0;
         double m_dragDeltaY = 0;
 };

test/renderedtarget/renderedtarget_test.cpp

@@ -440,6 +440,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     target.setMouseArea(&mouseArea);
 
     emit mouseArea.mouseMoved(1064, 651);
+    target.beforeRedraw();
     ASSERT_EQ(sprite.x(), 64.08);
     ASSERT_EQ(sprite.y(), -6.86);
     ASSERT_EQ(mouseArea.draggedSprite(), nullptr);
@@ -462,6 +463,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     ASSERT_FALSE(sprite.dragging());
 
     emit mouseArea.mouseMoved(1064, 651);
+    target.beforeRedraw();
     ASSERT_EQ(sprite.x(), 64.08);
     ASSERT_EQ(sprite.y(), -6.86);
     ASSERT_EQ(mouseArea.draggedSprite(), nullptr);
@@ -482,6 +484,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     ASSERT_FALSE(sprite.dragging());
 
     emit mouseArea.mouseMoved(1064, 651);
+    target.beforeRedraw();
     ASSERT_EQ(sprite.x(), 64.08);
     ASSERT_EQ(sprite.y(), -6.86);
     ASSERT_EQ(mouseArea.draggedSprite(), nullptr);
@@ -501,6 +504,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     ASSERT_FALSE(sprite.dragging());
 
     emit mouseArea.mouseMoved(1064, 651);
+    target.beforeRedraw();
     ASSERT_EQ(sprite.x(), 64.08);
     ASSERT_EQ(sprite.y(), -6.86);
     ASSERT_EQ(mouseArea.draggedSprite(), nullptr);
@@ -525,6 +529,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     emit mouseArea.mouseMoved(1067.8, 649.06);
+    target.beforeRedraw();
     ASSERT_EQ(std::round(sprite.x() * 100) / 100, 61.22);
     ASSERT_EQ(std::round(sprite.y() * 100) / 100, -14.41);
     ASSERT_EQ(mouseArea.draggedSprite(), &target);
@@ -533,6 +538,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     EXPECT_CALL(engine, stageWidth()).WillOnce(Return(480));
     EXPECT_CALL(engine, stageHeight()).WillOnce(Return(360));
     emit mouseArea.mouseMoved(1092.47, 605.46);
+    target.beforeRedraw();
     ASSERT_EQ(std::round(sprite.x() * 100) / 100, 68.26);
     ASSERT_EQ(std::round(sprite.y() * 100) / 100, -1.95);
     ASSERT_EQ(mouseArea.draggedSprite(), &target);
@@ -548,7 +554,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     anotherSprite.setY(-6.86);
     anotherSprite.setDraggable(true);
     anotherModel.init(&anotherSprite);
-    anotherTarget.setSpriteModel(&model);
+    anotherTarget.setSpriteModel(&anotherModel);
     anotherTarget.setStageScale(3.5);
     anotherTarget.setMouseArea(&mouseArea);
 
@@ -562,7 +568,7 @@ TEST_F(RenderedTargetTest, SpriteDragging)
     ASSERT_EQ(mouseArea.draggedSprite(), &target);
     ASSERT_TRUE(sprite.dragging());
     ASSERT_FALSE(anotherSprite.dragging());
-    EXPECT_CALL(engine, clickTarget(&sprite));
+    EXPECT_CALL(engine, clickTarget(&anotherSprite));
     QCoreApplication::sendEvent(&anotherTarget, &releaseEvent);
 
     // Stop dragging