Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-07 05:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2021-12-30 21:42:19 +01:00
parent 15b4a064f9 41e39ea6e1
commit 2aa9959553
13 changed files with 133 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imgui.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.86
// dear imgui, v1.87 WIP
// (main code and documentation)
// Help:
@ -11264,6 +11264,7 @@ bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_s
}
payload.DataFrameCount = g.FrameCount;
// Return whether the payload has been accepted
return (g.DragDropAcceptFrameCount == g.FrameCount) || (g.DragDropAcceptFrameCount == g.FrameCount - 1);
}