mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-08 04:40:09 +00:00
Code Activity

Merge branch 'viewport' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
This commit is contained in:
omar 2018-09-14 11:38:10 +02:00
commit e32256b4b4
58 changed files with 145 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/example_sdl_vulkan/main.cpp
View file

@ -1,5 +1,5 @@
// ImGui - standalone example application for SDL2 + Vulkan
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// dear imgui: standalone example application for SDL2 + Vulkan
// If you are new to dear imgui, see examples/README.txt and documentation at the top of imgui.cpp.
#include "imgui.h"
#include "imgui_impl_sdl.h"
@ -332,7 +332,7 @@ int main(int, char**)
ImGui_ImplVulkanH_WindowData* wd = &g_WindowData;
SetupVulkanWindowData(wd, surface, w, h);
// Setup ImGui binding
// Setup Dear ImGui binding
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls