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:
#	examples/example_apple_opengl2/main.mm
#	imgui.cpp
This commit is contained in:
ocornut
2020-10-01 13:33:08 +02:00
parent c49330fc52 5f336ce8f8
commit 958e58b06b
11 changed files with 227 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/example_apple_opengl2/main.mm
View File

@ -45,7 +45,7 @@
ImGui_ImplOSX_NewFrame(self);
ImGui::NewFrame();
// Global data for the demo
// Our state (make them static = more or less global) as a convenience to keep the example terse.
static bool show_demo_window = true;
static bool show_another_window = false;
static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
@ -243,10 +243,12 @@
NSLog(@"No OpenGL Context!");
// Setup Dear ImGui context
// FIXME: This example doesn't have proper cleanup...
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking
// Setup Dear ImGui style