Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare v1.82.1 #105

Merged
merged 6 commits into from
Nov 11, 2023
Merged

Prepare v1.82.1 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ad9dd3
fix docs and outdated example
IanButterworth Sep 24, 2023
6eb85fd
try removing bad reference
IanButterworth Sep 24, 2023
b0e2fcb
remove bad repo entry
IanButterworth Sep 24, 2023
fa126ba
set larger size_threshold
IanButterworth Sep 24, 2023
2cd40da
add Documenter compat
IanButterworth Sep 24, 2023
827274b
Prepare v1.82.1
JamesWrigley Nov 10, 2023
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
8 changes: 4 additions & 4 deletions Project.toml
View file
Open in desktop
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 = "1.82.0"
version = "1.82.1"

[deps]
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
Expand All @@ -15,10 +15,10 @@ Preferences = "21216c6a-2e73-6563-6e65-726566657250"
[compat]
CEnum = "0.4"
CSyntax = "0.4"
ImGuiGLFWBackend = "0.1, 0.2"
ImGuiGLFWBackend = "0.1"
ImGuiOpenGL2Backend = "0.1"
ImGuiOpenGLBackend = "0.1, 0.2"
LibCImGui = "~1.82, 1"
ImGuiOpenGLBackend = "0.1"
LibCImGui = "~1.82"
Preferences = "1"
julia = "1.6"

Expand Down
3 changes: 3 additions & 0 deletions docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[deps]
CImGui = "5d785b6c-b76f-510e-a07c-3070796c7e87"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"

[compat]
Documenter = "1"
4 changes: 2 additions & 2 deletions docs/make.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ using Documenter
makedocs(;
modules=[CImGui],
authors="Yupei Qi <qiyupei@gmail.com>",
repo="https://github.com/Gnimuc/CImGui.jl/blob/{commit}{path}#L{line}",
sitename="CImGui.jl",
format=Documenter.HTML(;
prettyurls=get(ENV, "CI", "false") == "true",
canonical="https://Gnimuc.github.io/CImGui.jl",
assets=String[],
size_threshold=400000
),
pages=[
"Introduction" => "index.md",
"API Reference" => "api.md",
],
]
)

deploydocs(;
Expand Down
2 changes: 1 addition & 1 deletion examples/demo_layout.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ function ShowDemoWindowLayout()
if CImGui.ListBoxHeader("List", size)
CImGui.Selectable("Selected", true)
CImGui.Selectable("Not Selected", false)
CImGui.ListBoxFooter()
CImGui.EndListBox()
end

CImGui.TreePop()
Expand Down
10 changes: 4 additions & 6 deletions src/wrapper.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,11 +1614,11 @@ If the function return true, you can output elements then call [`EndListBox`](@r
BeginListBox(label,size=ImVec2(0,0)) = igBeginListBox(label,size)

"""
ListBoxFooter()
EndListBox()
Terminate the scrolling region.

!!! note
Only call `ListBoxFooter()` if [`ListBoxHeader`](@ref) returned true!
Only call `EndListBox()` if [`BeginListBox`](@ref) returned true!
"""
EndListBox() = igEndListBox()

Expand Down Expand Up @@ -1894,9 +1894,8 @@ GetColumnsCount() = igGetColumnsCount()
# - 5. Call EndTable()
"""
BeginTable(str_id, columns_count, flags = ImGuiTableFlags_(0), outer_size = ImVec2(0,0), inner_width = 0.0) -> Bool
Begin a table entry.
Begin a table entry.
"""

BeginTable(str_id, columns_count, flags = ImGuiTableFlags_(0), outer_size = ImVec2(0,0), inner_width = 0.0) = igBeginTable(str_id, columns_count, flags, outer_size, inner_width)

"""
Expand All @@ -1914,7 +1913,7 @@ TableNextRow(row_flags = ImGuiTableRowFlags_(0), min_row_height = 0.0) = igTable
"""
TableNextColumn() -> Bool
Append into the next column (or first column of next row if currently in last column). Return true when column is visible.
"""
"""
TableNextColumn() = igTableNextColumn()

"""
Expand Down Expand Up @@ -2151,7 +2150,6 @@ EndDragDropTarget() = igEndDragDropTarget()
"""
GetDragDropPayload() -> Ptr{ImGuiPayload}
Peek directly into the current payload from anywhere. May return C_NULL.
Use [`IsDataType`](@ref) to test for the payload type.

!!! note "BETA API"
Missing Demo code. API may evolve.
Expand Down
Loading