- Proxy should adjust the drop info point to local space

- Drag and drop should convert to global space when tracking a drag and drop operation - Temporarily make drop_info::where mutable (we need a better solution).
cycfi · Feb 17, 2024 · 07e09c1 · 07e09c1
1 parent 04f16b3
commit 07e09c1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/lib/include/elements/base_view.hpp b/lib/include/elements/base_view.hpp
@@ -284,7 +284,7 @@ namespace cycfi { namespace elements
    struct drop_info
    {
       payload           data;
-      point             where;
+      mutable point     where;
    };
 
    ////////////////////////////////////////////////////////////////////////////

diff --git a/lib/src/element/drag_and_drop.cpp b/lib/src/element/drag_and_drop.cpp
@@ -411,7 +411,8 @@ namespace cycfi { namespace elements
             {
                payload pl;
                pl[address_to_string(di)] = {};
-               ctx.view.track_drop({pl, track_info.current}, cursor_tracking::entering);
+               auto where = ctx.canvas.user_to_device(track_info.current);
+               ctx.view.track_drop({pl, where}, cursor_tracking::entering);
             }
             track_info.processed = true;
          }
@@ -432,9 +433,10 @@ namespace cycfi { namespace elements
 
          if (auto* di = find_parent<drop_inserter_element *>(ctx))
          {
+            auto where = ctx.canvas.user_to_device(track_info.current);
             payload pl;
             pl[address_to_string(di)] = {};
-            ctx.view.track_drop({pl, track_info.current}, cursor_tracking::hovering);
+            ctx.view.track_drop({pl, where}, cursor_tracking::hovering);
             track_info.processed = true;
          }
          ctx.view.refresh(); // $$$ Don't be lazy $$$
@@ -458,12 +460,13 @@ namespace cycfi { namespace elements
          _drag_image.reset();
          ctx.view.refresh();
 
-         auto* di = find_parent<drop_inserter_element *>(ctx);
+         auto* di = find_parent<drop_inserter_element*>(ctx);
          if (di)
          {
             payload pl;
             pl[address_to_string(di)] = {};
-            ctx.view.track_drop({pl, track_info.current}, cursor_tracking::leaving);
+            auto where = ctx.canvas.user_to_device(track_info.current);
+            ctx.view.track_drop({pl, where}, cursor_tracking::leaving);
          }
 
          // Did we actually do a drag?

diff --git a/lib/src/element/proxy.cpp b/lib/src/element/proxy.cpp
@@ -194,17 +194,21 @@ namespace cycfi { namespace elements
    void proxy_base::track_drop(context const& ctx, drop_info const& info, cursor_tracking status)
    {
       context sctx {ctx, &subject(), ctx.bounds};
-      prepare_subject(sctx);
+      auto save = info.where;
+      prepare_subject(sctx, info.where);
       subject().track_drop(sctx, info, status);
       restore_subject(sctx);
+      info.where = save;
    }
 
    bool proxy_base::drop(context const& ctx, drop_info const& info)
    {
       context sctx {ctx, &subject(), ctx.bounds};
-      prepare_subject(sctx);
+      auto save = info.where;
+      prepare_subject(sctx, info.where);
       auto r = subject().drop(sctx, info);
       restore_subject(sctx);
+      info.where = save;
       return r;
    }
 }}