mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-17 07:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

Browse Source 
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2024-05-14 16:25:02 +02:00
parent e391fe2e66 e4576914cb
commit eabe98f6d5
28 changed files with 164 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backends/imgui_impl_allegro5.cpp
View File

@@ -424,6 +424,7 @@ static ImGuiKey ImGui_ImplAllegro5_KeyCodeToImGuiKey(int key_code)
bool ImGui_ImplAllegro5_Init(ALLEGRO_DISPLAY* display)
{
ImGuiIO& io = ImGui::GetIO();
IMGUI_CHECKVERSION();
IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!");
// Setup backend capabilities flags