From a283a1b1ae9c90f3fded0972ad59fa2d4d41343f Mon Sep 17 00:00:00 2001
From: Zicklag <zicklag@katharostech.com>
Date: Mon, 13 Jun 2022 18:02:40 -0500
Subject: [PATCH] Fix Drag and Drop Object Placement

At non-default zoom levels, the drop placement of objects on the map
change unexpectedly as soon as releasing the mouse button. This fixes
that.
---
 src/editor/mod.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/editor/mod.rs b/src/editor/mod.rs
index 291730597f..a1e8103500 100644
--- a/src/editor/mod.rs
+++ b/src/editor/mod.rs
@@ -1054,9 +1054,14 @@ impl Node for Editor {
         } else if let Some(dragged_object) = node.dragged_object.take() {
             let map = node.get_map();
 
+            let click_offset = match dragged_object {
+                DraggedObject::MapObject { click_offset, .. }
+                | DraggedObject::SpawnPoint { click_offset, .. } => click_offset,
+            };
+
             let cursor_world_position = scene::find_node_by_type::<EditorCamera>()
                 .unwrap()
-                .to_world_space(node.cursor_position);
+                .to_world_space(node.cursor_position - click_offset);
 
             let mut position = (cursor_world_position).clamp(
                 map.world_offset,
@@ -1074,10 +1079,8 @@ impl Node for Editor {
                     kind,
                     index,
                     layer_id,
-                    click_offset,
+                    ..
                 } => {
-                    let position = position - click_offset;
-
                     let action = EditorAction::UpdateObject {
                         id,
                         kind,
@@ -1088,12 +1091,7 @@ impl Node for Editor {
 
                     node.apply_action(action);
                 }
-                DraggedObject::SpawnPoint {
-                    index,
-                    click_offset,
-                } => {
-                    let position = position - click_offset;
-
+                DraggedObject::SpawnPoint { index, .. } => {
                     let action = EditorAction::MoveSpawnPoint { index, position };
 
                     node.apply_action(action);