Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.

Browse Source
This commit is contained in:
omar 2018-04-28 10:43:15 +02:00
parent d317951b37
commit f2e9dddeca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -13029,14 +13029,14 @@ bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_s
// Store in heap // Store in heap
g.DragDropPayloadBufHeap.resize((int)data_size); g.DragDropPayloadBufHeap.resize((int)data_size);
payload.Data = g.DragDropPayloadBufHeap.Data; payload.Data = g.DragDropPayloadBufHeap.Data;
memcpy((void*)(intptr_t)payload.Data, data, data_size); memcpy(payload.Data, data, data_size);
} }
else if (data_size > 0) else if (data_size > 0)
{ {
// Store locally // Store locally
memset(&g.DragDropPayloadBufLocal, 0, sizeof(g.DragDropPayloadBufLocal)); memset(&g.DragDropPayloadBufLocal, 0, sizeof(g.DragDropPayloadBufLocal));
payload.Data = g.DragDropPayloadBufLocal; payload.Data = g.DragDropPayloadBufLocal;
memcpy((void*)(intptr_t)payload.Data, data, data_size); memcpy(payload.Data, data, data_size);
} }
else else
{ {

2
imgui.h
View File

@ -1374,7 +1374,7 @@ struct ImGuiSizeCallbackData
struct ImGuiPayload struct ImGuiPayload
{ {
// Members // Members
const void* Data; // Data (copied and owned by dear imgui) void* Data; // Data (copied and owned by dear imgui)
int DataSize; // Data size int DataSize; // Data size
// [Internal] // [Internal]