Skip to content

Commit

Permalink
mvDragPayload now uses UUID to lookup, instead of copying the whole o…
Browse files Browse the repository at this point in the history 
…bject.

This may be a bit slower, but it makes resource management much easier.
Drag and drop doesn't crash anymore.
  • Loading branch information
@bzczb
bzczb committed Feb 13, 2024
1 parent b3d6ad0 commit 3e789c7
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 61 deletions.
47 changes: 27 additions & 20 deletions src/mvContainers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,19 +1110,20 @@ DearPyGui::draw_drag_payload(ImDrawList* drawlist, mvAppItem& item, mvDragPayloa
{
if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceAllowNullID))
{
ImGui::SetDragDropPayload(config.payloadType.c_str(), &item, sizeof(mvDragPayload));
ImGui::SetDragDropPayload(config.payloadType.c_str(), &item.uuid, sizeof(item.uuid));

if (item.info.parentPtr->config.dragCallback)
{
auto& parentPtr = item.info.parentPtr;
auto dragCallbackPtr = mvPyObjectStrictPtr(parentPtr->shared_from_this(), &parentPtr->config.dragCallback);
auto userDataPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.user_data);
auto& dragData = config.dragData;

mvAddCallbackJob({
dragCallbackPtr,
item.config.parent,
parentPtr->config.alias,
MV_APP_DATA_COPY_FUNC(config.dragData),
MV_APP_DATA_COPY_FUNC(dragData),
userDataPtr
});
}
Expand Down Expand Up @@ -1683,15 +1684,18 @@ apply_drag_drop(mvAppItem* item)
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item->config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item->shared_from_this(), &item->config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);

mvAddCallbackJob({
dropCallbackPtr,
item->uuid,
item->config.alias,
MV_APP_DATA_COPY_FUNC(payloadActual->configData.dragData),
nullptr
});
mvUUID payloadUuid = *static_cast<const mvUUID*>(payload->Data);
auto payloadActual = static_cast<const mvDragPayload*>(GetItem(*GContext->itemRegistry, payloadUuid));
if (payloadActual) {
auto& dragData = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item->uuid,
item->config.alias,
MV_APP_DATA_COPY_FUNC(dragData),
nullptr
});
}
}

ImGui::EndDragDropTarget();
Expand All @@ -1710,15 +1714,18 @@ apply_drag_drop_nodraw(mvAppItem* item)
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item->config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item->shared_from_this(), &item->config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);

mvAddCallbackJob({
dropCallbackPtr,
item->uuid,
item->config.alias,
MV_APP_DATA_COPY_FUNC(payloadActual->configData.dragData),
nullptr
});
mvUUID payloadUuid = *static_cast<const mvUUID*>(payload->Data);
auto payloadActual = static_cast<const mvDragPayload*>(GetItem(*GContext->itemRegistry, payloadUuid));
if (payloadActual) {
auto& dragData = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item->uuid,
item->config.alias,
MV_APP_DATA_COPY_FUNC(dragData),
nullptr
});
}
}

ImGui::EndDragDropTarget();
Expand Down
78 changes: 37 additions & 41 deletions src/mvPlotting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,14 +497,18 @@ DearPyGui::draw_plot(ImDrawList* drawlist, mvAppItem& item, mvPlotConfig& config
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);
auto dragDataPtr = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragDataPtr),
nullptr});
mvUUID payloadUuid = *static_cast<const mvUUID*>(payload->Data);
auto payloadActual = static_cast<const mvDragPayload*>(GetItem(*GContext->itemRegistry, payloadUuid));
if (payloadActual) {
auto& dragData = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragData),
nullptr
});
}
}

ImPlot::EndDragDropTarget();
Expand Down Expand Up @@ -619,37 +623,25 @@ DearPyGui::draw_plot_axis(ImDrawList* drawlist, mvAppItem& item, mvPlotAxisConfi

if (item.config.dropCallback)
{
const ImGuiPayload* payload;
ScopedID id(item.uuid);
if (item.info.location == 0 && ImPlot::BeginDragDropTargetX())
if ((item.info.location == 0 && ImPlot::BeginDragDropTargetX() &&
(payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))) ||
(ImPlot::BeginDragDropTargetY(item.info.location - 1) &&
(payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))))
{
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);
auto dragDataPtr = payloadActual->configData.dragData;
auto dropCallbackPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.dropCallback);
mvUUID payloadUuid = *static_cast<const mvUUID*>(payload->Data);
auto payloadActual = static_cast<const mvDragPayload*>(GetItem(*GContext->itemRegistry, payloadUuid));
if (payloadActual) {
auto& dragData = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragDataPtr),
nullptr});
}

ImPlot::EndDragDropTarget();
}
else if (ImPlot::BeginDragDropTargetY(item.info.location - 1))
{
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);
auto dragDataPtr = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragDataPtr),
nullptr});
MV_APP_DATA_COPY_FUNC(dragData),
nullptr
});
}

ImPlot::EndDragDropTarget();
Expand Down Expand Up @@ -705,14 +697,18 @@ DearPyGui::draw_plot_legend(ImDrawList* drawlist, mvAppItem& item, mvPlotLegendC
if (const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(item.config.payloadType.c_str()))
{
auto dropCallbackPtr = mvPyObjectStrictPtr(item.shared_from_this(), &item.config.dropCallback);
auto payloadActual = static_cast<const mvDragPayload*>(payload->Data);
auto dragDataPtr = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragDataPtr),
nullptr});
mvUUID payloadUuid = *static_cast<const mvUUID*>(payload->Data);
auto payloadActual = static_cast<const mvDragPayload*>(GetItem(*GContext->itemRegistry, payloadUuid));
if (payloadActual) {
auto& dragData = payloadActual->configData.dragData;
mvAddCallbackJob({
dropCallbackPtr,
item.uuid,
item.config.alias,
MV_APP_DATA_COPY_FUNC(dragData),
nullptr
});
}
}

ImPlot::EndDragDropTarget();
Expand Down

0 comments on commit 3e789c7

Please sign in to comment.