From 35bdca86d8f4fb3e6f04f66b95ac8bb60e99e99d Mon Sep 17 00:00:00 2001 From: gucio321 Date: Tue, 24 Oct 2023 10:09:01 +0200 Subject: [PATCH 1/3] deps: update cimgui-go --- go.mod | 3 ++- go.sum | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5837e21a..5ac7ef14 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 0053baaf..38133a2c 100644 --- a/go.sum +++ b/go.sum @@ -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= From dedad9b0b0730227d074e67d40ffef09852abc0f Mon Sep 17 00:00:00 2001 From: gucio321 Date: Tue, 24 Oct 2023 10:12:57 +0200 Subject: [PATCH 2/3] run go generate --- StyleIDs_string.go | 15 ++++++++++----- StyleIDs_string2enum.go | 9 +++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/StyleIDs_string.go b/StyleIDs_string.go index 96f7447a..8a99c562 100644 --- a/StyleIDs_string.go +++ b/StyleIDs_string.go @@ -110,27 +110,32 @@ func _() { _ = x[StyleVarGrabMinSize-20] _ = x[StyleVarGrabRounding-21] _ = x[StyleVarTabRounding-22] - _ = x[StyleVarButtonTextAlign-23] - _ = x[StyleVarSelectableTextAlign-24] + _ = x[StyleVarButtonTextAlign-24] + _ = x[StyleVarSelectableTextAlign-25] } const ( _StyleVarID_name_0 = "alphadisabled-alphawindow-paddingwindow-roundingwindow-border-sizewindow-min-sizewindow-title-alignchild-roundingchild-border-sizepopup-roundingpopup-border-sizeframe-paddingframe-roundingframe-border-sizeitem-spacingitem-inner-spacingindent-spacing" - _StyleVarID_name_1 = "scrollbar-sizescrollbar-roundinggrab-min-sizegrab-roundingtab-roundingbutton-text-alignselectable-text-align" + _StyleVarID_name_1 = "scrollbar-sizescrollbar-roundinggrab-min-sizegrab-roundingtab-rounding" + _StyleVarID_name_2 = "button-text-alignselectable-text-align" ) var ( _StyleVarID_index_0 = [...]uint8{0, 5, 19, 33, 48, 66, 81, 99, 113, 130, 144, 161, 174, 188, 205, 217, 235, 249} - _StyleVarID_index_1 = [...]uint8{0, 14, 32, 45, 58, 70, 87, 108} + _StyleVarID_index_1 = [...]uint8{0, 14, 32, 45, 58, 70} + _StyleVarID_index_2 = [...]uint8{0, 17, 38} ) func (i StyleVarID) String() string { switch { case 0 <= i && i <= 16: return _StyleVarID_name_0[_StyleVarID_index_0[i]:_StyleVarID_index_0[i+1]] - case 18 <= i && i <= 24: + case 18 <= i && i <= 22: i -= 18 return _StyleVarID_name_1[_StyleVarID_index_1[i]:_StyleVarID_index_1[i+1]] + case 24 <= i && i <= 25: + i -= 24 + return _StyleVarID_name_2[_StyleVarID_index_2[i]:_StyleVarID_index_2[i+1]] default: return "StyleVarID(" + strconv.FormatInt(int64(i), 10) + ")" } diff --git a/StyleIDs_string2enum.go b/StyleIDs_string2enum.go index 92ce946b..4edb22c3 100644 --- a/StyleIDs_string2enum.go +++ b/StyleIDs_string2enum.go @@ -149,6 +149,11 @@ func StyleVarIDFromString(s string) StyleVarID { return StyleVarID(i + 18) } } + for i := range _StyleVarID_index_2[:len(_StyleVarID_index_2)-1] { + if s == _StyleVarID_name_2[_StyleVarID_index_2[i]:_StyleVarID_index_2[i+1]] { + return StyleVarID(i + 24) + } + } panic(fmt.Errorf("unable to locate StyleVarID enum corresponding to %q", s)) } @@ -199,9 +204,9 @@ func _(s string) { case "grab-rounding": // 22 case "tab-rounding": - // 23 - case "button-text-align": // 24 + case "button-text-align": + // 25 case "selectable-text-align": } } From a8adf24499fa3eeb056dcab615b2ce31b9d047e4 Mon Sep 17 00:00:00 2001 From: gucio321 Date: Tue, 24 Oct 2023 10:17:05 +0200 Subject: [PATCH 3/3] style IDs: add StyleVarCellPadding fix #721 --- StyleIDs.go | 2 ++ StyleIDs_string.go | 18 +++++++----------- StyleIDs_string2enum.go | 7 ++----- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/StyleIDs.go b/StyleIDs.go index 65ef313d..b5951142 100644 --- a/StyleIDs.go +++ b/StyleIDs.go @@ -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. diff --git a/StyleIDs_string.go b/StyleIDs_string.go index 8a99c562..13d9adb5 100644 --- a/StyleIDs_string.go +++ b/StyleIDs_string.go @@ -105,6 +105,7 @@ func _() { _ = x[StyleVarItemSpacing-14] _ = x[StyleVarItemInnerSpacing-15] _ = x[StyleVarIndentSpacing-16] + _ = x[StyleVarCellPadding-17] _ = x[StyleVarScrollbarSize-18] _ = x[StyleVarScrollbarRounding-19] _ = x[StyleVarGrabMinSize-20] @@ -115,27 +116,22 @@ func _() { } const ( - _StyleVarID_name_0 = "alphadisabled-alphawindow-paddingwindow-roundingwindow-border-sizewindow-min-sizewindow-title-alignchild-roundingchild-border-sizepopup-roundingpopup-border-sizeframe-paddingframe-roundingframe-border-sizeitem-spacingitem-inner-spacingindent-spacing" - _StyleVarID_name_1 = "scrollbar-sizescrollbar-roundinggrab-min-sizegrab-roundingtab-rounding" - _StyleVarID_name_2 = "button-text-alignselectable-text-align" + _StyleVarID_name_0 = "alphadisabled-alphawindow-paddingwindow-roundingwindow-border-sizewindow-min-sizewindow-title-alignchild-roundingchild-border-sizepopup-roundingpopup-border-sizeframe-paddingframe-roundingframe-border-sizeitem-spacingitem-inner-spacingindent-spacingStyleVarCellPaddingscrollbar-sizescrollbar-roundinggrab-min-sizegrab-roundingtab-rounding" + _StyleVarID_name_1 = "button-text-alignselectable-text-align" ) var ( - _StyleVarID_index_0 = [...]uint8{0, 5, 19, 33, 48, 66, 81, 99, 113, 130, 144, 161, 174, 188, 205, 217, 235, 249} - _StyleVarID_index_1 = [...]uint8{0, 14, 32, 45, 58, 70} - _StyleVarID_index_2 = [...]uint8{0, 17, 38} + _StyleVarID_index_0 = [...]uint16{0, 5, 19, 33, 48, 66, 81, 99, 113, 130, 144, 161, 174, 188, 205, 217, 235, 249, 268, 282, 300, 313, 326, 338} + _StyleVarID_index_1 = [...]uint8{0, 17, 38} ) func (i StyleVarID) String() string { switch { - case 0 <= i && i <= 16: + case 0 <= i && i <= 22: return _StyleVarID_name_0[_StyleVarID_index_0[i]:_StyleVarID_index_0[i+1]] - case 18 <= i && i <= 22: - i -= 18 - return _StyleVarID_name_1[_StyleVarID_index_1[i]:_StyleVarID_index_1[i+1]] case 24 <= i && i <= 25: i -= 24 - return _StyleVarID_name_2[_StyleVarID_index_2[i]:_StyleVarID_index_2[i+1]] + return _StyleVarID_name_1[_StyleVarID_index_1[i]:_StyleVarID_index_1[i+1]] default: return "StyleVarID(" + strconv.FormatInt(int64(i), 10) + ")" } diff --git a/StyleIDs_string2enum.go b/StyleIDs_string2enum.go index 4edb22c3..e1b5282b 100644 --- a/StyleIDs_string2enum.go +++ b/StyleIDs_string2enum.go @@ -146,11 +146,6 @@ func StyleVarIDFromString(s string) StyleVarID { } for i := range _StyleVarID_index_1[:len(_StyleVarID_index_1)-1] { if s == _StyleVarID_name_1[_StyleVarID_index_1[i]:_StyleVarID_index_1[i+1]] { - return StyleVarID(i + 18) - } - } - for i := range _StyleVarID_index_2[:len(_StyleVarID_index_2)-1] { - if s == _StyleVarID_name_2[_StyleVarID_index_2[i]:_StyleVarID_index_2[i+1]] { return StyleVarID(i + 24) } } @@ -194,6 +189,8 @@ func _(s string) { case "item-inner-spacing": // 16 case "indent-spacing": + // 17 + case "StyleVarCellPadding": // 18 case "scrollbar-size": // 19