Emulation/Gopher2600
1
0
Fork 0
mirror of https://github.com/JetSetIlly/Gopher2600.git synced 2024-06-02 20:18:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

bumped imgui-go to v4.0.0

Browse source
This commit is contained in:
JetSetIlly 2021-02-16 16:12:42 +00:00
parent a7cecfe0fe
commit b6374dc00b
50 changed files with 62 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
go.mod
View file

@ -2,9 +2,9 @@ module github.com/jetsetilly/gopher2600
go 1.15
// replace github.com/inkyblackness/imgui-go/v3 v3.1.1-0.20210215191654-0feeb7fcffbf => /home/steve/Go/steve_forks/imgui-go
// replace github.com/inkyblackness/imgui-go/v4 v4.0.0 => /home/steve/Go/steve_forks/imgui-go
// replace github.com/inkyblackness/imgui-go/v3 v3.1.1-0.20210215191654-0feeb7fcffbf => github.com/JetSetIlly/imgui-go/v3 v3.1.1-0.20210216121002-1f684a886de9
// replace github.com/inkyblackness/imgui-go/v4 v4.0.0 => github.com/JetSetIlly/imgui-go/v4 v4.0.0
require (
github.com/bradleyjkemp/memviz v0.2.3
@ -13,7 +13,7 @@ require (
github.com/go-echarts/statsview v0.3.1
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
github.com/hajimehoshi/go-mp3 v0.3.1
github.com/inkyblackness/imgui-go/v3 v3.1.1-0.20210215191654-0feeb7fcffbf
github.com/inkyblackness/imgui-go/v4 v4.0.0
github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
github.com/veandco/go-sdl2 v0.4.4
)

15
go.sum
View file

@ -1,5 +1,3 @@
github.com/JetSetIlly/imgui-go/v3 v3.1.1-0.20210216121002-1f684a886de9 h1:rm+VPy38GGjiW2JzRe+IxT0GDInvcqBFPBF1Q4n4kKw=
github.com/JetSetIlly/imgui-go/v3 v3.1.1-0.20210216121002-1f684a886de9/go.mod h1:WdM5LZHuTrjd1d+yd2fA19t3mG538kJ6zOLB2sAXF6U=
github.com/bradleyjkemp/cupaloy/v2 v2.5.0 h1:XI37Pqyl+msFaJDYL3JuPFKGUgnVxyJp+gQZQGiz2nA=
github.com/bradleyjkemp/cupaloy/v2 v2.5.0/go.mod h1:TD5UU0rdYTbu/TtuwFuWrtiRARuN7mtRipvs/bsShSE=
github.com/bradleyjkemp/memviz v0.2.3 h1:8fqKnV1xQz4NQkDy5Gklhm9fGtUK+R3oW0z1unBDFGY=
@ -21,15 +19,11 @@ github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluN
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
github.com/hajimehoshi/go-mp3 v0.3.1 h1:pn/SKU1+/rfK8KaZXdGEC2G/KCB2aLRjbTCrwKcokao=
github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
github.com/hajimehoshi/oto v0.6.1 h1:7cJz/zRQV4aJvMSSRqzN2TImoVVMpE0BCY4nrNJaDOM=
github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
github.com/inkyblackness/imgui-go/v3 v3.0.0 h1:+gOBA/xlr528SOGDteKQS+q7QkyBcOi+znhn18BMs/8=
github.com/inkyblackness/imgui-go/v3 v3.0.0/go.mod h1:WdM5LZHuTrjd1d+yd2fA19t3mG538kJ6zOLB2sAXF6U=
github.com/inkyblackness/imgui-go/v3 v3.1.1-0.20210215191654-0feeb7fcffbf h1:zUb06q2ohWrBa9/iboCVe0B1YyQrjD9MX3W9YotYg9U=
github.com/inkyblackness/imgui-go/v3 v3.1.1-0.20210215191654-0feeb7fcffbf/go.mod h1:WdM5LZHuTrjd1d+yd2fA19t3mG538kJ6zOLB2sAXF6U=
github.com/inkyblackness/imgui-go/v4 v4.0.0 h1:s3d4Qd0KAxvqXK9JAa+QNhbfEvpXkJ9OqpKBYacRTHA=
github.com/inkyblackness/imgui-go/v4 v4.0.0/go.mod h1:g8SAGtOYUP7rYaOB2AsVKCEHmPMDmJKgt4z6d+flhb0=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@ -40,7 +34,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@ -48,16 +41,12 @@ github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgh
github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/veandco/go-sdl2 v0.4.4 h1:coOJGftOdvNvGoUIZmm4XD+ZRQF4mg9ZVHmH3/42zFQ=
github.com/veandco/go-sdl2 v0.4.4/go.mod h1:FB+kTpX9YTE+urhYiClnRzpOXbiWgaU3+5F2AB78DPg=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8 h1:idBdZTd9UioThJp8KpM/rTSinK/ChZFBE43/WtIy8zg=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 h1:KYGJGHOQy8oSi1fDlSpcZF0+juKwk/hEMv5SiwHogR0=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6 h1:vyLBGJPIl9ZYbcQFM2USFmJBK6KI+t+z6jL0lbwjrnc=
golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 h1:cGjJzUd8RgBw428LXP65YXni0aiGNA4Bl+ls8SmLOm8=
golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=

2
gui/sdlimgui/colors.go
View file

@ -19,7 +19,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/television/specification"
"github.com/jetsetilly/gopher2600/reflection"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// imguiColors defines all the colors used by the GUI. Fields with leading

2
gui/sdlimgui/glsl.go
View file

@ -22,7 +22,7 @@ import (
"unsafe"
"github.com/go-gl/gl/v3.2-core/gl"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/gui"
"github.com/jetsetilly/gopher2600/gui/crt/shaders"
"github.com/jetsetilly/gopher2600/hardware/television"

2
gui/sdlimgui/imgui_helpers.go
View file

@ -20,7 +20,7 @@ import (
"strconv"
"strings"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// return the height of the window from the current cursor position to the end

2
gui/sdlimgui/imgui_palette.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
type popupState int

2
gui/sdlimgui/imgui_sequence.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// drawlistSequence provides a neat way of drawlist elements of a uniform size in

2
gui/sdlimgui/imgui_textinput.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"strings"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// calls imguiInput with the string of allowed hexadecimal characters.

2
gui/sdlimgui/keyboard.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/veandco/go-sdl2/sdl"
)

2
gui/sdlimgui/manager.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// the window type represents all the windows used in the sdlimgui.

2
gui/sdlimgui/manager_menu.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// the window menus grouped by type. the types are:.

2
gui/sdlimgui/modal_plusrom_nick.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/plusrom"
"github.com/jetsetilly/gopher2600/logger"
)

2
gui/sdlimgui/platform.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"runtime"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/logger"
"github.com/veandco/go-sdl2/sdl"
)

2
gui/sdlimgui/sdlimgui.go
View file

@ -32,7 +32,7 @@ import (
"github.com/jetsetilly/gopher2600/reflection"
"github.com/veandco/go-sdl2/sdl"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
// imguiIniFile is where imgui will store the coordinates of the imgui windows

2
gui/sdlimgui/service.go
View file

@ -19,7 +19,7 @@ import (
"github.com/jetsetilly/gopher2600/gui"
"github.com/jetsetilly/gopher2600/logger"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/veandco/go-sdl2/sdl"
)

2
gui/sdlimgui/win_audio.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winAudioID = "Audio"

2
gui/sdlimgui/win_cart_cdf.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/harmony/cdf"
)

2
gui/sdlimgui/win_cart_dpc.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge"
)

2
gui/sdlimgui/win_cart_dpcplus.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/harmony/dpcplus"
)

2
gui/sdlimgui/win_cart_ram.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/memorymap"
)

2
gui/sdlimgui/win_cart_static.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winCartStaticID = "Static Areas"

2
gui/sdlimgui/win_cart_supercharger.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/supercharger"
)

2
gui/sdlimgui/win_cart_tape.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"strconv"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winCartTapeID = "Cassette Tape"

2
gui/sdlimgui/win_chip_registers.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"strconv"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/addresses"
)

2
gui/sdlimgui/win_collisions.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/tia/video"
)

2
gui/sdlimgui/win_control.go
View file

@ -19,7 +19,7 @@ import (
"github.com/jetsetilly/gopher2600/debugger"
"github.com/jetsetilly/gopher2600/gui"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winControlID = "Control"

4
gui/sdlimgui/win_controllers.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/riot/ports"
"github.com/jetsetilly/gopher2600/hardware/riot/ports/controllers"
)
@ -100,7 +100,7 @@ func (win *winControllers) drawController(player int) {
}
imgui.PushItemWidth(win.controllerComboDim.X)
if imgui.BeginComboV(fmt.Sprintf("##%d", player), p.Name(), imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV(fmt.Sprintf("##%d", player), p.Name(), imgui.ComboFlagsNoArrowButton) {
for _, s := range controllers.ControllerList {
if imgui.Selectable(s) {
termCmd := fmt.Sprintf("CONTROLLER %d %s", player, s)

2
gui/sdlimgui/win_coproc_lastexecution.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winCoProcLastExecutionID = "Last Execution"

2
gui/sdlimgui/win_cpu.go
View file

@ -22,7 +22,7 @@ import (
"github.com/jetsetilly/gopher2600/disassembly"
"github.com/jetsetilly/gopher2600/hardware/cpu/registers"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winCPUID = "CPU"

2
gui/sdlimgui/win_crt_prefs.go
View file

@ -20,7 +20,7 @@ import (
"image"
"github.com/go-gl/gl/v3.2-core/gl"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/television/specification"
"github.com/jetsetilly/gopher2600/logger"
)

6
gui/sdlimgui/win_dbgscr.go
View file

@ -20,7 +20,7 @@ import (
"image"
"github.com/go-gl/gl/v3.2-core/gl"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/disassembly"
"github.com/jetsetilly/gopher2600/gui"
"github.com/jetsetilly/gopher2600/hardware/television/specification"
@ -256,7 +256,7 @@ func (win *winDbgScr) draw() {
// tv status line
imgui.PushItemWidth(win.specComboDim.X)
if imgui.BeginComboV("##spec", win.img.lz.TV.Spec.ID, imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##spec", win.img.lz.TV.Spec.ID, imgui.ComboFlagsNoArrowButton) {
for _, s := range specification.SpecList {
if imgui.Selectable(s) {
win.img.term.pushCommand(fmt.Sprintf("TV SPEC %s", s))
@ -348,7 +348,7 @@ func (win *winDbgScr) drawOverlayCombo() {
selected = win.img.lz.CoProc.ID
}
if imgui.BeginComboV("##overlay", selected, imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##overlay", selected, imgui.ComboFlagsNoArrowButton) {
for _, s := range reflection.OverlayList {
// skip overlays that aren't relevant given the current state of the emualation
if s == reflection.COPROCESSOR {

4
gui/sdlimgui/win_disasm.go
View file

@ -24,7 +24,7 @@ import (
"github.com/jetsetilly/gopher2600/gui"
"github.com/jetsetilly/gopher2600/hardware/memory/memorymap"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winDisasmID = "Disassembly"
@ -133,7 +133,7 @@ func (win *winDisasm) draw() {
// bank selector / information
comboPreview := fmt.Sprintf("Viewing bank %d", win.selectedBank)
if imgui.BeginComboV("##bankselect", comboPreview, imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##bankselect", comboPreview, imgui.ComboFlagsNoArrowButton) {
for n := 0; n < win.img.lz.Cart.NumBanks; n++ {
if imgui.Selectable(fmt.Sprintf("View bank %d", n)) {
win.selectedBank = n

2
gui/sdlimgui/win_log.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winLogID = "Log"

2
gui/sdlimgui/win_playscr.go
View file

@ -17,7 +17,7 @@ package sdlimgui
import (
"github.com/go-gl/gl/v3.2-core/gl"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winPlayScrID = "Atari VCS"

2
gui/sdlimgui/win_playscr_fps.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"time"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winPlayScrFPSID = "FPS"

2
gui/sdlimgui/win_plusrom_network.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"strconv"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/plusrom"
)

2
gui/sdlimgui/win_plusrom_prefs.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/cartridge/plusrom"
)

2
gui/sdlimgui/win_prefs.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/logger"
)

2
gui/sdlimgui/win_ram.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/memory/memorymap"
)

2
gui/sdlimgui/win_rom_select.go
View file

@ -22,7 +22,7 @@ import (
"path/filepath"
"strings"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/cartridgeloader"
"github.com/jetsetilly/gopher2600/logger"
)

2
gui/sdlimgui/win_savekey_eeprom.go
View file

@ -16,7 +16,7 @@
package sdlimgui
import (
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/riot/ports/savekey"
)

2
gui/sdlimgui/win_savekey_i2c.go
View file

@ -19,7 +19,7 @@ import (
"fmt"
"strconv"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/riot/ports/savekey"
)

2
gui/sdlimgui/win_terminal.go
View file

@ -25,7 +25,7 @@ import (
"github.com/jetsetilly/gopher2600/gui"
"github.com/jetsetilly/gopher2600/logger"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winTermID = "Terminal"

2
gui/sdlimgui/win_tia.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"github.com/jetsetilly/gopher2600/hardware/tia/video"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winTIAID = "TIA"

4
gui/sdlimgui/win_tia_ball.go
View file

@ -22,7 +22,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/tia/video"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
func (win *winTIA) drawBall() {
@ -94,7 +94,7 @@ func (win *winTIA) drawBall() {
// ctrlpf, size selector and drawing info
imgui.BeginGroup()
imgui.PushItemWidth(win.ballSizeComboDim.X)
if imgui.BeginComboV("##ballsize", video.BallSizes[lz.Size], imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##ballsize", video.BallSizes[lz.Size], imgui.ComboFlagsNoArrowButton) {
for k := range video.BallSizes {
if imgui.Selectable(video.BallSizes[k]) {
v := uint8(k) // being careful about scope

6
gui/sdlimgui/win_tia_missile.go
View file

@ -22,7 +22,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/tia/video"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
func (win *winTIA) drawMissile(missile int) {
@ -92,7 +92,7 @@ func (win *winTIA) drawMissile(missile int) {
// nusiz
imgui.BeginGroup()
imgui.PushItemWidth(win.missileCopiesComboDim.X)
if imgui.BeginComboV("##missilecopies", video.MissileCopies[lz.Copies], imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##missilecopies", video.MissileCopies[lz.Copies], imgui.ComboFlagsNoArrowButton) {
for k := range video.MissileCopies {
if imgui.Selectable(video.MissileCopies[k]) {
v := uint8(k) // being careful about scope
@ -109,7 +109,7 @@ func (win *winTIA) drawMissile(missile int) {
imgui.SameLine()
imgui.PushItemWidth(win.missileSizeComboDim.X)
if imgui.BeginComboV("##missilesize", video.MissileSizes[lz.Size], imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##missilesize", video.MissileSizes[lz.Size], imgui.ComboFlagsNoArrowButton) {
for k := range video.MissileSizes {
if imgui.Selectable(video.MissileSizes[k]) {
v := uint8(k) // being careful about scope

4
gui/sdlimgui/win_tia_player.go
View file

@ -22,7 +22,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/tia/video"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
func (win *winTIA) drawPlayer(num int) {
@ -167,7 +167,7 @@ func (win *winTIA) drawPlayer(num int) {
// nusiz
imgui.BeginGroup()
imgui.PushItemWidth(win.playerSizeAndCopiesComboDim.X)
if imgui.BeginComboV("##playersizecopies", video.PlayerSizes[lz.SizeAndCopies], imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##playersizecopies", video.PlayerSizes[lz.SizeAndCopies], imgui.ComboFlagsNoArrowButton) {
for k := range video.PlayerSizes {
if imgui.Selectable(video.PlayerSizes[k]) {
v := uint8(k) // being careful about scope

2
gui/sdlimgui/win_tia_playfield.go
View file

@ -21,7 +21,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/tia/video"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
func (win *winTIA) drawPlayfield() {

2
gui/sdlimgui/win_tia_revisions.go
View file

@ -18,7 +18,7 @@ package sdlimgui
import (
"fmt"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
"github.com/jetsetilly/gopher2600/hardware/tia/revision"
"github.com/jetsetilly/gopher2600/logger"
)

4
gui/sdlimgui/win_timer.go
View file

@ -21,7 +21,7 @@ import (
"github.com/jetsetilly/gopher2600/hardware/riot/timer"
"github.com/inkyblackness/imgui-go/v3"
"github.com/inkyblackness/imgui-go/v4"
)
const winTimerID = "Timer"
@ -67,7 +67,7 @@ func (win *winTimer) draw() {
imgui.BeginV(win.id(), &win.open, imgui.WindowFlagsAlwaysAutoResize)
imgui.PushItemWidth(win.intervalComboDim.X)
if imgui.BeginComboV("##timerinterval", win.img.lz.Timer.Divider, imgui.ComboFlagNoArrowButton) {
if imgui.BeginComboV("##timerinterval", win.img.lz.Timer.Divider, imgui.ComboFlagsNoArrowButton) {
for _, s := range timer.IntervalList {
if imgui.Selectable(s) {
t := s // being careful about scope