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

deps: update cimgui-go to v1.3.1 #946

Merged
merged 6 commits into from
Mar 18, 2025
Merged

deps: update cimgui-go to v1.3.1 #946

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
97f6e07
deps: update cimgui-go to v1.3.1
gucio321 Mar 18, 2025
f6fa562
giu: use ImageWithBgV instead of ImageV
gucio321 Mar 18, 2025
42a5958
flags: fix reference
gucio321 Mar 18, 2025
c7ce0a3
run go generate
gucio321 Mar 18, 2025
e438feb
workflows: update golangci version
gucio321 Mar 18, 2025
131c33e
Merge remote-tracking branch 'upstream/master'
gucio321 Mar 18, 2025
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/golangci-lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v6
with:
version: v1.61.0
version: v1.64.8
2 changes: 1 addition & 1 deletion Flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ const (
// // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker.
ColorEditFlagsAlphaBar ColorEditFlags = ColorEditFlags(imgui.ColorEditFlagsAlphaBar)
// // ColorEdit, ColorPicker, ColorButton: display preview as a transparent color over a checkerboard, instead of opaque.
ColorEditFlagsAlphaPreview ColorEditFlags = ColorEditFlags(imgui.ColorEditFlagsAlphaPreview)
ColorEditFlagsAlphaPreview ColorEditFlags = ColorEditFlags(imgui.ColorEditFlagsAlphaPreviewHalf)
// // ColorEdit, ColorPicker, ColorButton: display half opaque / half checkerboard, instead of opaque.
ColorEditFlagsAlphaPreviewHalf ColorEditFlags = ColorEditFlags(imgui.ColorEditFlagsAlphaPreviewHalf)
// // (WIP) ColorEdit: Currently only disable 0.0f..1.0f limits in RGBA edition (note: you probably want to use ImGuiColorEditFlags_Float flag as well).
Expand Down
2 changes: 1 addition & 1 deletion ImageWidgets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (i *ImageWidget) Build() {
}
}

imgui.ImageV(i.texture.tex.ID, size, i.uv0, i.uv1, ToVec4Color(i.tintColor), ToVec4Color(i.borderColor))
imgui.ImageWithBgV(i.texture.tex.ID, size, i.uv0, i.uv1, ToVec4Color(i.borderColor), ToVec4Color(i.tintColor))
}

type imageState struct {
Expand Down
2 changes: 1 addition & 1 deletion ReflectiveBoundTexture.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func (i *ReflectiveBoundTexture) ImguiImageV(width, height float32, options Imgu
size.Y = rect.Y
}

imgui.ImageV(i.Texture().ID(), size, options.Uv0, options.Uv1, options.TintCol, options.BorderCol)
imgui.ImageWithBgV(i.Texture().ID(), size, options.Uv0, options.Uv1, options.BorderCol, options.TintCol)
}

// ImguiImageButtonV renders the ReflectiveBoundTexture as an image button in ImGui with additional options.
Expand Down
7 changes: 5 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
module github.com/AllenDang/giu

go 1.23.3
go 1.24.0

toolchain go1.24.1

require (
github.com/AllenDang/cimgui-go v1.3.0
github.com/AllenDang/cimgui-go v1.3.1
github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8
github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3
github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8
github.com/juliettef/IconFontCppHeaders v0.0.0-20250310113834-3eac3a08c436
github.com/mazznoer/csscolorparser v0.1.5
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/AllenDang/cimgui-go v1.3.0 h1:iFK0SBjfOnd8qCnn8PLMFh/uTceuJGN0hVXRxokMz20=
github.com/AllenDang/cimgui-go v1.3.0/go.mod h1:1i5vebTbRcCAlui+AUn3A3U0V2tu/qImW0NoLr+/Fek=
github.com/AllenDang/cimgui-go v1.3.1 h1:2f33a7GHJwRofH0CRQbUTXywazfph/K5LQLKyOBv24k=
github.com/AllenDang/cimgui-go v1.3.1/go.mod h1:Fuj3G2E3zd2bMQxmhuSPSFFl41MwS+MhyZ6DHgYq/YM=
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=
Expand All @@ -8,6 +8,8 @@ github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 h1:baVdMKlASEHr
github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3/go.mod h1:VEPNJUlxl5KdWjDvz6Q1l+rJlxF2i6xqDeGuGAxa87M=
github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8 h1:aczNwZRrReVWrZcqxvDjDmxP1NFISTAu+1Cp+3OCbUg=
github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8/go.mod h1:Z3+NtD1rjXUVZg97dojhs70i5oneOrZ1xcFKfF/c2Ts=
github.com/juliettef/IconFontCppHeaders v0.0.0-20250310113834-3eac3a08c436 h1:FTvXrMW0ZstVDAGR3KyE9faID//0WSEBDZguZyjcLGY=
github.com/juliettef/IconFontCppHeaders v0.0.0-20250310113834-3eac3a08c436/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.5 h1:Wr4uNIE+pHWN3TqZn2SGpA2nLRG064gB7WdSfSS5cz4=
Expand Down
97 changes: 51 additions & 46 deletions stylevarid_enumer.go
View file
Open in desktop

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

Loading