Skip to content

Commit

Permalink
Merge pull request #32 from Gnimuc/upgrade-178
Browse files Browse the repository at this point in the history
Misc. updates for ImGui 1.78, fix #31
  • Loading branch information
Gnimuc authored Aug 23, 2020
2 parents a72d02e + 412d9a4 commit 30e5b6d
Show file tree
Hide file tree
Showing 10 changed files with 341 additions and 257 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
version:
- '1.4'
- '1.5'
os:
- ubuntu-latest
- macOS-latest
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
- run: sudo apt-get install xvfb && Xvfb :99 &
- uses: julia-actions/setup-julia@v1
with:
version: '1.4'
version: '1.5'
- run: |
julia --project=docs -e '
using Pkg
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ os:
- osx
- windows
julia:
- 1.3
- 1.4
- nightly
matrix:
allow_failures:
Expand Down
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 = ["Gnimuc <[email protected]>"]
version = "1.77.1"
version = "1.78.0"

[deps]
CImGui_jll = "7dd61d3b-0da5-5c94-bbf9-a0296c6e3925"
Expand All @@ -11,7 +11,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
ModernGL = "66fc600b-dfda-50eb-8b99-91cfa97b1301"

[compat]
CImGui_jll = "~1.77.0"
CImGui_jll = "~1.78.0"
CSyntax = "0.4.0"
GLFW = "3.2.0,3.3.0,3.4.0"
ModernGL = "1.1.0"
Expand Down
5 changes: 5 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
comment: false
coverage:
status:
project: off
patch: off
2 changes: 1 addition & 1 deletion examples/demo_widgets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function ShowDemoWindowWidgets()
ShowHelpMarker("CTRL+click to input value.")

@c CImGui.SliderFloat("slider float", &f1, 0.0, 1.0, "ratio = %.3f")
@c CImGui.SliderFloat("slider float (curve)", &f2, -10.0, 10.0, "%.4f", 2.0)
@c CImGui.SliderFloat("slider float (log)", &f2, -10.0, 10.0, "%.4f", CImGui.ImGuiSliderFlags_Logarithmic)

@c CImGui.SliderAngle("slider angle", &angle)
end
Expand Down
236 changes: 110 additions & 126 deletions gen/libcimgui_api.jl

Large diffs are not rendered by default.

Loading

2 comments on commit 30e5b6d

@Gnimuc
Copy link
Owner Author

@Gnimuc Gnimuc commented on 30e5b6d Aug 23, 2020

Choose a reason for hiding this comment

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

@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/20021

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 v1.78.0 -m "<description of version>" 30e5b6d96f03fa697b3a276a8f91adf87f8ed211
git push origin v1.78.0

Please sign in to comment.