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

Merge branch 'viewport' into docking

Browse Source 
# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_marmalade/main.cpp
This commit is contained in:
omar
2018-11-15 14:00:01 +01:00
parent ae34241f8b dcbf976a8e
commit 4a43f347bb
23 changed files with 172 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/example_win32_directx11/main.cpp
View File

@ -128,7 +128,7 @@ int main(int, char**)
ShowWindow(hwnd, SW_SHOWDEFAULT);
UpdateWindow(hwnd);
// Setup Dear ImGui binding
// Setup Dear ImGui context
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
@ -142,10 +142,11 @@ int main(int, char**)
io.ConfigResizeWindowsFromEdges = true;
io.ConfigDockingWithShift = true;
// Setup Platform/Renderer bindings
ImGui_ImplWin32_Init(hwnd);
ImGui_ImplDX11_Init(g_pd3dDevice, g_pd3dDeviceContext);
// Setup style
// Setup Style
ImGui::GetStyle().WindowRounding = 0.0f;
ImGui::StyleColorsDark();
//ImGui::StyleColorsClassic();