Merge branch 'master' into docking

# Conflicts: # docs/CHANGELOG.txt
2025-07-04 20:18:47 +02:00 · 2019-06-18 23:08:03 +02:00
parent ca43436cd3 dd41df3e98
commit e2c1f0a7cd
27 changed files with 556 additions and 39 deletions
--- a/examples/example_glfw_vulkan/main.cpp
+++ b/examples/example_glfw_vulkan/main.cpp
@ -452,6 +452,7 @@ int main(int, char**)
        ImGui_ImplVulkan_DestroyFontUploadObjects();
    }

+    // Our state
    bool show_demo_window = true;
    bool show_another_window = false;
    ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);