Skip to content

Commit

Permalink
Merge pull request #163 from JuliaImGui/v1.91.8
Browse files Browse the repository at this point in the history
Update bindings for v1.91.8 and bump version
  • Loading branch information
JamesWrigley authored Feb 9, 2025
2 parents e020273 + cf38df1 commit b6ca5b3
Show file tree
Hide file tree
Showing 19 changed files with 8,775 additions and 8,265 deletions.
4 changes: 2 additions & 2 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 = "4.0.0"
version = "5.0.0"

[deps]
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
Expand All @@ -23,7 +23,7 @@ MakieIntegration = ["GLFW", "ModernGL", "GLMakie"]

[compat]
CEnum = "0.4, 0.5"
CImGuiPack_jll = "0.7.0"
CImGuiPack_jll = "0.8.0"
CSyntax = "0.4"
Compat = "4.16.0"
DocStringExtensions = "0.9.3"
Expand Down
10 changes: 10 additions & 0 deletions docs/src/_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ CurrentModule = CImGui
This documents notable changes in CImGui.jl. The format is based on [Keep a
Changelog](https://keepachangelog.com).

## [v5.0.0] - 2025-02-05

### Changed
- **Breaking**: We updated to [Dear ImGui
1.91.8](https://github.com/ocornut/imgui/releases/tag/v1.91.8) ([#163]). All the
changes from 1.91.7 and 1.91.8 apply to this release.

### Fixed
- Fixed compatibility with the Makie v0.22 ([#163]).

## [v4.0.0] - 2024-12-21

### Changed
Expand Down
6 changes: 3 additions & 3 deletions examples/demo_widgets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,8 @@ function ShowDemoWindowWidgets()
end

if CImGui.TreeNode("Color/Picker Widgets")
@cstatic color=Cfloat[114/255, 144/255, 154/255, 200/255] backup_color=Cfloat[0,0,0,0] saved_palette_init=true saved_palette=fill(ImVec4(0,0,0,0), 32) alpha_preview=true alpha_half_preview=false drag_and_drop=true options_menu=true hdr=false begin
@c CImGui.Checkbox("With Alpha Preview", &alpha_preview)
@cstatic color=Cfloat[114/255, 144/255, 154/255, 200/255] backup_color=Cfloat[0,0,0,0] saved_palette_init=true saved_palette=fill(ImVec4(0,0,0,0), 32) alpha_opaque=true alpha_half_preview=false drag_and_drop=true options_menu=true hdr=false begin
@c CImGui.Checkbox("With Alpha Opage", &alpha_opaque)
@c CImGui.Checkbox("With Half Alpha Preview", &alpha_half_preview)
@c CImGui.Checkbox("With Drag and Drop", &drag_and_drop)
@c CImGui.Checkbox("With Options Menu", &options_menu)
Expand All @@ -622,7 +622,7 @@ function ShowDemoWindowWidgets()
@c CImGui.Checkbox("With HDR", &hdr)
CImGui.SameLine()
CImGui.HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets.")
misc_flags = (hdr ? CImGui.ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : CImGui.ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? CImGui.ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? CImGui.ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : CImGui.ImGuiColorEditFlags_NoOptions)
misc_flags = (hdr ? CImGui.ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : CImGui.ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? CImGui.ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_opaque ? CImGui.ImGuiColorEditFlags_AlphaOpaque : 0)) | (options_menu ? 0 : CImGui.ImGuiColorEditFlags_NoOptions)

CImGui.Text("Color widget:")
CImGui.SameLine()
Expand Down
1 change: 1 addition & 0 deletions ext/MakieIntegration.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ end
Base.isopen(window::ImMakieWindow) = isopen(window.glfw_window)
GLMakie.framebuffer_size(window::ImMakieWindow) = GLMakie.framebuffer_size(window.glfw_window)
GLMakie.scale_factor(window::ImMakieWindow) = GLMakie.scale_factor(window.glfw_window)
GLMakie.was_destroyed(window::ImMakieWindow) = GLMakie.was_destroyed(window.glfw_window)
GLMakie.reopen!(x::GLMakie.Screen{ImMakieWindow}) = x
GLMakie.set_screen_visibility!(::GLMakie.Screen{ImMakieWindow}, ::Bool) = nothing

Expand Down
Loading

2 comments on commit b6ca5b3

@JamesWrigley
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

Release notes:

See the changelog for breaking changes: https://juliaimgui.github.io/CImGui.jl/stable/changelog/

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/124664

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v5.0.0 -m "<description of version>" b6ca5b31d6bc97f636c9968f675c5b77bf984337
git push origin v5.0.0

Please sign in to comment.