Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.9'
- '1.10'
- '1'
- 'nightly'
os:
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
6 changes: 6 additions & 0 deletions docs/src/_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ext/MakieIntegration.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
11 changes: 9 additions & 2 deletions gen/generator.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand Down
122 changes: 121 additions & 1 deletion lib/aarch64-apple-darwin20.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/aarch64-linux-gnu.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/aarch64-linux-musl.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/armv7l-linux-gnueabihf.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/armv7l-linux-musleabihf.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/i686-linux-gnu.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/i686-linux-musl.jl

Large diffs are not rendered by default.

214 changes: 183 additions & 31 deletions lib/i686-w64-mingw32.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/powerpc64le-linux-gnu.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/x86_64-apple-darwin14.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/x86_64-linux-gnu.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/x86_64-linux-musl.jl

Large diffs are not rendered by default.

122 changes: 121 additions & 1 deletion lib/x86_64-unknown-freebsd13.2.jl

Large diffs are not rendered by default.

214 changes: 183 additions & 31 deletions lib/x86_64-w64-mingw32.jl

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,7 @@ Formatted text.

[Upstream link](https://github.com/ocornut/imgui/blob/v1.92.1-docking/imgui.h#L613).
"""
function Text end
Text(fmt) = igText(fmt)

"""
Expand Down