Skip to content

Commit

Permalink
Merge pull request #722 from gucio321/update-cimgui
Browse files Browse the repository at this point in the history
Update cimgui; fix style IDs bugs
  • Loading branch information
gucio321 authored Oct 24, 2023
2 parents 4a0ed9c + a8adf24 commit 0cc79b2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 15 deletions.
2 changes: 2 additions & 0 deletions StyleIDs.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ const (
StyleVarItemInnerSpacing = StyleVarID(imgui.StyleVarItemInnerSpacing) // item-inner-spacing
// StyleVarIndentSpacing is a float.
StyleVarIndentSpacing = StyleVarID(imgui.StyleVarIndentSpacing) // indent-spacing
// StyleVarCellPadding is a Vec2
StyleVarCellPadding = StyleVarID(imgui.StyleVarCellPadding)
// StyleVarScrollbarSize is a float.
StyleVarScrollbarSize = StyleVarID(imgui.StyleVarScrollbarSize) // scrollbar-size
// StyleVarScrollbarRounding is a float.
Expand Down
19 changes: 10 additions & 9 deletions StyleIDs_string.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions StyleIDs_string2enum.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ module github.com/AllenDang/giu
go 1.21

require (
github.com/AllenDang/cimgui-go v0.0.0-20230918114712-675654f053d9
github.com/AllenDang/cimgui-go v0.0.0-20231009021832-f9856eb4a9a7
github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8
github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3
github.com/juliettef/IconFontCppHeaders v0.0.0-20230803153112-1a083cca7d65
github.com/mazznoer/csscolorparser v0.1.3
github.com/napsy/go-css v0.0.0-20221107082635-4ed403047a64
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
github.com/AllenDang/cimgui-go v0.0.0-20230918114712-675654f053d9 h1:tITzow7xji/fjyoGZcji6+XazqAtTUiO5T5+YJBbqh8=
github.com/AllenDang/cimgui-go v0.0.0-20230918114712-675654f053d9/go.mod h1:UH0IZCbsJKA1hAVQQU6AIDfamqTk0/d3VucaN8lp1Gs=
github.com/AllenDang/cimgui-go v0.0.0-20231009021832-f9856eb4a9a7 h1:5+ZimDtDqluBYrfZkbBH8++N2M6z6nFtLT24cdthLsw=
github.com/AllenDang/cimgui-go v0.0.0-20231009021832-f9856eb4a9a7/go.mod h1:UH0IZCbsJKA1hAVQQU6AIDfamqTk0/d3VucaN8lp1Gs=
github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8 h1:dKZMqib/yUDoCFigmz2agG8geZ/e3iRq304/KJXqKyw=
github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8/go.mod h1:b4uuDd0s6KRIPa84cEEchdQ9ICh7K0OryZHbSzMca9k=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 h1:baVdMKlASEHrj19iqjARrPbaRisD7EuZEVJj6ZMLl1Q=
github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3/go.mod h1:VEPNJUlxl5KdWjDvz6Q1l+rJlxF2i6xqDeGuGAxa87M=
github.com/juliettef/IconFontCppHeaders v0.0.0-20230803153112-1a083cca7d65 h1:gOG4RoefWNOMFCISCtv1JSWVw1UUeSTZ0fdm4M0uQ4Q=
github.com/juliettef/IconFontCppHeaders v0.0.0-20230803153112-1a083cca7d65/go.mod h1:edkq0hzsRusIHvIaeynCDd0hpwLQbjjHcGnMEuADrVk=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/mazznoer/csscolorparser v0.1.3 h1:vug4zh6loQxAUxfU1DZEu70gTPufDPspamZlHAkKcxE=
Expand Down

0 comments on commit 0cc79b2

Please sign in to comment.