mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-04-19 21:16:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorder Cancel option in menus to be more consistent (fixes #32)

Browse Source
This commit is contained in:
comp500 2021-06-03 22:54:56 +01:00
parent c6b99a50e2
commit d6bed7ad4c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
curseforge/install.go
View File

@ -292,6 +292,7 @@ func searchCurseforgeInternal(args []string, mcVersion string) (bool, modInfo) {
menu := wmenu.NewMenu("Choose a number:") menu := wmenu.NewMenu("Choose a number:")
menu.Option("Cancel", nil, false, nil)
if len(fuzzySearchResults) == 0 { if len(fuzzySearchResults) == 0 {
for i, v := range results { for i, v := range results {
menu.Option(v.Name, v, i == 0, nil) menu.Option(v.Name, v, i == 0, nil)
@ -301,7 +302,6 @@ func searchCurseforgeInternal(args []string, mcVersion string) (bool, modInfo) {
menu.Option(results[v.Index].Name, results[v.Index], i == 0, nil) menu.Option(results[v.Index].Name, results[v.Index], i == 0, nil)
} }
} }
menu.Option("Cancel", nil, false, nil)
var modInfoData modInfo var modInfoData modInfo
var cancelled bool var cancelled bool

2
modrinth/install.go
View File

@ -105,10 +105,10 @@ func installViaSearch(query string, pack core.Pack) error {
//Create menu for the user to choose the correct mod //Create menu for the user to choose the correct mod
menu := wmenu.NewMenu("Choose a number:") menu := wmenu.NewMenu("Choose a number:")
menu.Option("Cancel", nil, false, nil)
for i, v := range results { for i, v := range results {
menu.Option(v.Title, v, i == 0, nil) menu.Option(v.Title, v, i == 0, nil)
} }
menu.Option("Cancel", nil, false, nil)
menu.Action(func(menuRes []wmenu.Opt) error { menu.Action(func(menuRes []wmenu.Opt) error {
if len(menuRes) != 1 || menuRes[0].Value == nil { if len(menuRes) != 1 || menuRes[0].Value == nil {