Skip to content

Commit 61b591c

Browse files
gen2braingen2brain
authored
Merge pull request #530 from gethiox/master
RayGui update: v4.0 > v4.5-dev
2 parents 040fd2b + cc44e07 commit 61b591c

File tree

8 files changed

+2062
-1473
lines changed

8 files changed

+2062
-1473
lines changed

‎examples/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/gen2brain/raylib-go/easings v0.0.0-00010101000000-000000000000
1515
github.com/gen2brain/raylib-go/physics v0.0.0-00010101000000-000000000000
1616
github.com/gen2brain/raylib-go/raygui v0.0.0-00010101000000-000000000000
17-
github.com/gen2brain/raylib-go/raylib v0.0.0-20241202103652-5d50abe7c65b
17+
github.com/gen2brain/raylib-go/raylib v0.0.0-20251228111424-040fd2b41803
1818
github.com/jakecoffman/cp v1.2.1
1919
github.com/neguse/go-box2d-lite v0.0.0-20170921151050-5d8ed9b7272b
2020
)

‎examples/gui/controls_test_suite/controls_test_suite.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func main() {
168168
if gui.ValueBox(rl.Rectangle{25, 175, 125, 30}, "", &valueBox002Value, 0, 100, valueBoxEditMode) {
169169
valueBoxEditMode = !valueBoxEditMode
170170
}
171-
gui.SetStyle(gui.TEXTBOX, gui.TEXT_ALIGNMENT, int64(gui.TEXT_ALIGN_LEFT))
171+
gui.SetStyle(gui.TEXTBOX, gui.TEXT_ALIGNMENT, gui.TEXT_ALIGN_LEFT)
172172
if gui.TextBox(rl.Rectangle{25, 215, 125, 30}, &textBoxText, 64, textBoxEditMode) {
173173
textBoxEditMode = !textBoxEditMode
174174
}
@@ -199,7 +199,7 @@ func main() {
199199
comboBoxActive = gui.ComboBox(rl.Rectangle{25, 470, 125, 30}, "ONE;TWO;THREE;FOUR", comboBoxActive)
200200

201201
// NOTE: gui.DropdownBox must draw after any other control that can be covered on unfolding
202-
gui.SetStyle(gui.DROPDOWNBOX, gui.TEXT_ALIGNMENT, int64(gui.TEXT_ALIGN_LEFT))
202+
gui.SetStyle(gui.DROPDOWNBOX, gui.TEXT_ALIGNMENT, gui.TEXT_ALIGN_LEFT)
203203
if gui.DropdownBox(rl.Rectangle{25, 65, 125, 30}, "#01#ONE;#02#TWO;#03#THREE;#04#FOUR", &dropdownBox001Active, dropDown001EditMode) {
204204
dropDown001EditMode = !dropDown001EditMode
205205
}

‎examples/gui/scroll_panel/scroll_panel.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,30 +130,30 @@ func DrawStyleEditControls() {
130130
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.BORDER_WIDTH))
131131
gui.Label(rl.Rectangle{555, 195, 110, 10}, "BORDER_WIDTH")
132132
gui.Spinner(rl.Rectangle{670, 190, 90, 20}, "", &style, 0, 6, false)
133-
gui.SetStyle(gui.SCROLLBAR, gui.BORDER_WIDTH, int64(style))
133+
gui.SetStyle(gui.SCROLLBAR, gui.BORDER_WIDTH, gui.PropertyValue(style))
134134

135135
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.ARROWS_SIZE))
136136
gui.Label(rl.Rectangle{555, 220, 110, 10}, "ARROWS_SIZE")
137137
gui.Spinner(rl.Rectangle{670, 215, 90, 20}, "", &style, 4, 14, false)
138-
gui.SetStyle(gui.SCROLLBAR, gui.ARROWS_SIZE, int64(style))
138+
gui.SetStyle(gui.SCROLLBAR, gui.ARROWS_SIZE, gui.PropertyValue(style))
139139

140-
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING))
141-
gui.Label(rl.Rectangle{555, 245, 110, 10}, "SLIDER_PADDING")
140+
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.SCROLL_PADDING))
141+
gui.Label(rl.Rectangle{555, 245, 110, 10}, "SCROLL_PADDING")
142142
gui.Spinner(rl.Rectangle{670, 240, 90, 20}, "", &style, 0, 14, false)
143-
gui.SetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING, int64(style))
143+
gui.SetStyle(gui.SCROLLBAR, gui.SCROLL_PADDING, gui.PropertyValue(style))
144144

145145
style = boolToint32(gui.CheckBox(rl.Rectangle{565, 280, 20, 20}, "ARROWS_VISIBLE", int32Tobool(int32(gui.GetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE)))))
146-
gui.SetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE, int64(style))
146+
gui.SetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE, gui.PropertyValue(style))
147147

148-
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING))
148+
style = int32(gui.GetStyle(gui.SLIDER, gui.SLIDER_PADDING))
149149
gui.Label(rl.Rectangle{555, 325, 110, 10}, "SLIDER_PADDING")
150150
gui.Spinner(rl.Rectangle{670, 320, 90, 20}, "", &style, 0, 14, false)
151-
gui.SetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING, int64(style))
151+
gui.SetStyle(gui.SLIDER, gui.SLIDER_PADDING, gui.PropertyValue(style))
152152

153-
style = int32(gui.GetStyle(gui.SCROLLBAR, gui.SLIDER_WIDTH))
153+
style = int32(gui.GetStyle(gui.SLIDER, gui.SLIDER_WIDTH))
154154
gui.Label(rl.Rectangle{555, 350, 110, 10}, "SLIDER_WIDTH")
155155
gui.Spinner(rl.Rectangle{670, 345, 90, 20}, "", &style, 2, 100, false)
156-
gui.SetStyle(gui.SCROLLBAR, gui.SLIDER_WIDTH, int64(style))
156+
gui.SetStyle(gui.SLIDER, gui.SLIDER_WIDTH, gui.PropertyValue(style))
157157

158158
var text string
159159
if gui.GetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE) == gui.SCROLLBAR_LEFT_SIDE {
@@ -162,7 +162,7 @@ func DrawStyleEditControls() {
162162
text = "SCROLLBAR: RIGHT"
163163
}
164164
style = boolToint32(gui.Toggle(rl.Rectangle{560, 110, 200, 35}, text, int32Tobool(int32(gui.GetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE)))))
165-
gui.SetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE, int64(style))
165+
gui.SetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE, gui.PropertyValue(style))
166166
//----------------------------------------------------------
167167

168168
// ScrollBar style controls
@@ -172,12 +172,12 @@ func DrawStyleEditControls() {
172172
style = int32(gui.GetStyle(gui.LISTVIEW, gui.SCROLLBAR_WIDTH))
173173
gui.Label(rl.Rectangle{555, 35, 110, 10}, "SCROLLBAR_WIDTH")
174174
gui.Spinner(rl.Rectangle{670, 30, 90, 20}, "", &style, 6, 30, false)
175-
gui.SetStyle(gui.LISTVIEW, gui.SCROLLBAR_WIDTH, int64(style))
175+
gui.SetStyle(gui.LISTVIEW, gui.SCROLLBAR_WIDTH, gui.PropertyValue(style))
176176

177-
style = int32(gui.GetStyle(gui.DEFAULT, gui.BORDER_WIDTH))
177+
style = int32(gui.GetStyle(gui.LISTVIEW, gui.BORDER_WIDTH))
178178
gui.Label(rl.Rectangle{555, 60, 110, 10}, "BORDER_WIDTH")
179179
gui.Spinner(rl.Rectangle{670, 55, 90, 20}, "", &style, 0, 20, false)
180-
gui.SetStyle(gui.DEFAULT, gui.BORDER_WIDTH, int64(style))
180+
gui.SetStyle(gui.LISTVIEW, gui.BORDER_WIDTH, gui.PropertyValue(style))
181181
//----------------------------------------------------------
182182
}
183183

‎raygui/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/gen2brain/raylib-go/raygui
22

33
go 1.22.0
44

5-
require github.com/gen2brain/raylib-go/raylib v0.0.0-20241202103652-5d50abe7c65b
5+
require github.com/gen2brain/raylib-go/raylib v0.0.0-20251228111424-040fd2b41803
66

77
require (
88
github.com/ebitengine/purego v0.8.1 // indirect

‎raygui/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE=
22
github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
3-
github.com/gen2brain/raylib-go/raylib v0.0.0-20241202103652-5d50abe7c65b h1:wK8D9x3f+BX1xFGgjj399dYx2eskikDZHxlRaSSA19Q=
4-
github.com/gen2brain/raylib-go/raylib v0.0.0-20241202103652-5d50abe7c65b/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
3+
github.com/gen2brain/raylib-go/raylib v0.0.0-20251228111424-040fd2b41803 h1:YHQiAR/67HYtNXppsKnjHLfLresV2sJjcL3fXLz6vJc=
4+
github.com/gen2brain/raylib-go/raylib v0.0.0-20251228111424-040fd2b41803/go.mod h1:BaY76bZk7nw1/kVOSQObPY1v1iwVE1KHAGMfvI6oK1Q=
55
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
66
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak=
77
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=

0 commit comments

Comments
 (0)