summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick White <git@njw.name>2024-01-29 00:25:33 +0000
committerNick White <git@njw.name>2024-01-29 00:25:33 +0000
commit0dcac3285cc674b8cfe1134c0494802329cf51ae (patch)
treecf4522844d93ea36e04b602b374401896a0737eb
parent3c00df0ff61ac45def703c25a4b63f2e795c3dfd (diff)
Just hide & show container directly rather than swapping between different window content to do it
-rw-r--r--cmd/rescribe/gui.go16
1 files changed, 7 insertions, 9 deletions
diff --git a/cmd/rescribe/gui.go b/cmd/rescribe/gui.go
index a4bdfdb..8790f03 100644
--- a/cmd/rescribe/gui.go
+++ b/cmd/rescribe/gui.go
@@ -438,7 +438,7 @@ func startGui(log *log.Logger, cmd string, gbookcmd string, training string, tes
myWindow.Resize(fyne.NewSize(800, 400))
var abortbtn, gobtn *widget.Button
- var fullContent *fyne.Container
+ var chosen *fyne.Container
dir := widget.NewLabel("")
@@ -451,7 +451,7 @@ func startGui(log *log.Logger, cmd string, gbookcmd string, training string, tes
}
dir.SetText(uri.Path())
dirIcon.SetResource(theme.FolderIcon())
- myWindow.SetContent(fullContent)
+ chosen.Show()
gobtn.Enable()
}, myWindow)
d.Resize(fyne.NewSize(740, 600))
@@ -466,7 +466,7 @@ func startGui(log *log.Logger, cmd string, gbookcmd string, training string, tes
uri.Close()
dir.SetText(uri.URI().Path())
dirIcon.SetResource(theme.DocumentIcon())
- myWindow.SetContent(fullContent)
+ chosen.Show()
gobtn.Enable()
}, myWindow)
d.SetFilter(storage.NewExtensionFileFilter([]string{".pdf"}))
@@ -517,7 +517,7 @@ func startGui(log *log.Logger, cmd string, gbookcmd string, training string, tes
}
dir.SetText(fmt.Sprintf("Google Book: %s Save to: %s", id, dirEntry.Text))
dirIcon.SetResource(theme.SearchIcon())
- myWindow.SetContent(fullContent)
+ chosen.Show()
gobtn.Enable()
}, myWindow)
d.Resize(fyne.NewSize(600, 200))
@@ -568,14 +568,12 @@ func startGui(log *log.Logger, cmd string, gbookcmd string, training string, tes
choices := container.New(layout.NewGridLayout(3), folderBtn, pdfBtn, gbookBtn)
- chosen := container.New(layout.NewBorderLayout(nil, nil, dirIcon, nil), dirIcon, dir)
+ chosen = container.New(layout.NewBorderLayout(nil, nil, dirIcon, nil), dirIcon, dir)
+ chosen.Hide()
trainingBits := container.New(layout.NewBorderLayout(nil, nil, trainingLabel, nil), trainingLabel, trainingOpts)
- // TODO: add / remove widgets rather than swapping between fullContent and startContent
- fullBox := container.NewVBox(choices, chosen, trainingBits, wipe, bigpdf, gobtn, abortbtn, progressBar)
- fullContent = container.NewBorder(fullBox, nil, nil, nil, detail)
- startBox := container.NewVBox(choices, trainingBits, wipe, bigpdf, gobtn, abortbtn, progressBar)
+ startBox := container.NewVBox(choices, chosen, trainingBits, wipe, bigpdf, gobtn, abortbtn, progressBar)
startContent := container.NewBorder(startBox, nil, nil, nil, detail)
myWindow.SetContent(startContent)