diff --git a/Project.toml b/Project.toml index 4177f7a..786987d 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ImGuiTestEngine" uuid = "464e2eba-0a11-4ed3-b274-413caa1a1cca" authors = ["JamesWrigley "] -version = "0.1.3" +version = "0.1.4" [deps] CImGui = "5d785b6c-b76f-510e-a07c-3070796c7e87" @@ -14,7 +14,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] CImGui = "2,3" -CImGuiPack_jll = "0.3,0.4,0.5,0.6" +CImGuiPack_jll = "0.3,0.4,0.5,0.6,0.7" Compat = "4.15.0" CxxWrap = "0.16.0" DocStringExtensions = "0.9.3" diff --git a/docs/src/_changelog.md b/docs/src/_changelog.md index 22462d4..c6b2181 100644 --- a/docs/src/_changelog.md +++ b/docs/src/_changelog.md @@ -7,6 +7,10 @@ CurrentModule = ImGuiTestEngine This documents notable changes in ImGuiTestEngine.jl. The format is based on [Keep a Changelog](https://keepachangelog.com). +## [v0.1.4] - 2024-11-19 + +Patch release to fix compat for CImGui v4/Dear ImGui 1.91.5 ([#8]). + ## [v0.1.3] - 2024-10-08 Patch release to add compat for CImGui v3.1/Dear ImGui 1.91.2 ([#7]). diff --git a/src/engine.jl b/src/engine.jl index 5ae6674..b9d25cb 100644 --- a/src/engine.jl +++ b/src/engine.jl @@ -516,7 +516,7 @@ macro register_test(f, engine::Symbol, category::AbstractString, name::AbstractS end -ig._test_engine_is_running(engine::Engine) = GetIO(engine).IsRunningTests +ig._test_engine_is_running(engine::Engine) = !lib.ImGuiTestEngine_IsTestQueueEmpty(engine.ptr) function ig._start_test_engine(engine::Engine, ctx::Ptr{libig.ImGuiContext}) Start(engine, ctx) diff --git a/test/runtests.jl b/test/runtests.jl index bb8c4d1..45fec7d 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -149,16 +149,7 @@ end ran_test_func = true end - te.QueueTests(engine) - te.Start(engine, ctx) - - ig.render(ctx) do - # te.ShowTestEngineWindows(engine) - - if !engine_io.IsRunningTests - return :imgui_exit_loop - end - end + ig.render(ctx; engine) do ; end @test ran_gui_func @test ran_test_func @@ -196,14 +187,7 @@ end noret_exited_at_end = true end - te.Start(engine, ctx) - te.QueueTests(engine) - - ig.render(ctx) do - if !te.GetIO(engine).IsRunningTests - return :imgui_exit_loop - end - end + ig.render(ctx; engine) do ; end @test imcheck_entered_test @test !imcheck_exited_at_end