mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-22 15:21:15 +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

5
imgui_demo.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.90.6
// dear imgui, v1.90.7 WIP
// (demo code)
// Help:
@@ -278,6 +278,9 @@ void ImGui::ShowDemoWindow(bool* p_open)
// Most functions would normally just assert/crash if the context is missing.
IM_ASSERT(ImGui::GetCurrentContext() != NULL && "Missing Dear ImGui context. Refer to examples app!");
// Verify ABI compatibility between caller code and compiled version of Dear ImGui. This helps detects some build issues.
IMGUI_CHECKVERSION();
// Examples Apps (accessible from the "Examples" menu)
static bool show_app_main_menu_bar = false;
static bool show_app_console = false;