mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-17 01:04:19 +00:00
Code 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
commit eabe98f6d5
28 changed files with 164 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/imgui_impl_android.cpp
View file

@ -264,6 +264,8 @@ int32_t ImGui_ImplAndroid_HandleInputEvent(const AInputEvent* input_event)
bool ImGui_ImplAndroid_Init(ANativeWindow* window)
{
IMGUI_CHECKVERSION();
g_Window = window;
g_Time = 0.0;