Merge pull request #180 from JuliaImGui/makie-update

Fix GLMakie 0.13 compatibility and bump version

Author: JamesWrigley

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
           - '1'
           - 'nightly'
         os:

Project.toml

@@ -1,7 +1,7 @@
 name = "CImGui"
 uuid = "5d785b6c-b76f-510e-a07c-3070796c7e87"
 authors = ["Yupei Qi <qiyupei@gmail.com>"]
-version = "6.1.0"
+version = "6.1.1"
 
 [deps]
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
@@ -27,9 +27,9 @@ CImGuiPack_jll = "0.10.0"
 CSyntax = "0.4"
 DocStringExtensions = "0.9.3"
 GLFW = "3"
-GLMakie = "0.10.6, 0.12, 0.13"
+GLMakie = "0.13"
 ModernGL = "1"
 PrecompileTools = "1.2.1"
 Printf = "1"
 Statistics = "1"
-julia = "1.9"
+julia = "1.10"

docs/src/_changelog.md

@@ -6,6 +6,12 @@ CurrentModule = CImGui
 This documents notable changes in CImGui.jl. The format is based on [Keep a
 Changelog](https://keepachangelog.com).
 
+## [v6.1.1] - 2025-09-27
+
+### Fixed
+- Fixed compatibility with Makie 0.24/GLMakie 0.13 and Julia 1.12 ([#180]). This
+  required bumping the minimum support Julia version to 1.10.
+
 ## [v6.1.0] - 2025-07-30
 
 ### Changed

ext/MakieIntegration.jl

@@ -160,6 +160,7 @@ function ig.MakieFigure(title_id::String, f::GLMakie.Figure;
         resize!(f, new_size[1], new_size[2])
     end
 
+    GLMakie.poll_updates(imfigure.screen)
     do_render = GLMakie.requires_update(imfigure.screen)
     if do_render
         idx = mod1(imfigure.times_idx, length(imfigure.render_times))

gen/generator.jl

@@ -102,7 +102,7 @@ function imgui_to_jl_type(ig_type)
         [:(NTuple{2})]
     elseif parsed_type === :ImVec4
         [:(NTuple{4})]
-    elseif getproperty(bindings_module, parsed_type) in (Cint, Cuint)
+    elseif @invokelatest(getproperty(bindings_module, parsed_type)) in (Cint, Cuint)
         [:Integer]
     elseif endswith(string(parsed_type), "Callback")
         # Allow passing CFunctions and Ptr{Cvoid}'s to callback arguments
@@ -119,7 +119,7 @@ function imgui_to_jl_type(ig_type)
         # Note that we have to use getproperty() and catch an exception because
         # `bindings_module` is an anonymous module, for which propertynames()
         # doesn't work as usual.
-        getproperty(bindings_module, enum_type)
+        @invokelatest getproperty(bindings_module, enum_type)
         pushfirst!(unions, enum_type)
     catch ex
         if !(ex isa UndefVarError)
@@ -572,6 +572,13 @@ function generate()
                       $(w.docstring)
                       \"\"\"
                       """)
+
+                # If the function name is exported from Base then we need to explicitly
+                # declare a new function with `function` to avoid warnings on 1.12+.
+                if Base.isexported(Base, Symbol(w.name))
+                    write(io, "function $(w.name) end\n")
+                end
+
                 write(io, string(w.expr), "\n\n")
             end