Update fyne API usage

xypwn · Dec 20, 2024 · 3440f40 · 3440f40
1 parent dd0191e
commit 3440f40
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/internal/gui/downloads.go b/internal/gui/downloads.go
@@ -348,7 +348,7 @@ func NewDownloads(dls *logic.Downloads, mobile bool, cfgClient *data.Client[*log
 	sel.SetSelectedIndex(0)
 
 	var clearFiltersButton *widget.Button
-	content := container.NewMax()
+	content := container.NewStack()
 	{
 		clearFiltersButton = widget.NewButtonWithIcon(
 			"Clear Filters",
@@ -391,7 +391,7 @@ func NewDownloads(dls *logic.Downloads, mobile bool, cfgClient *data.Client[*log
 			),
 		)
 
-		placeholder := container.NewMax()
+		placeholder := container.NewStack()
 
 		var lock sync.Mutex
 		init := true

diff --git a/internal/gui/episode.go b/internal/gui/episode.go
@@ -100,7 +100,7 @@ func NewEpisode(
 			nil,
 		),
 		placeholderImage:  canvas.NewImageFromResource(theme.FileImageIcon()),
-		thumbnailImageCnt: container.NewMax(),
+		thumbnailImageCnt: container.NewStack(),
 		thumbnailProgress: widget.NewProgressBarInfinite(),
 		thumbnailOverlay:  canvas.NewRectangle(color.RGBA{16, 16, 16, 160}),
 		thumbnailText:     canvas.NewText("", color.RGBA{255, 255, 255, 255}),
@@ -117,7 +117,9 @@ func NewEpisode(
 
 	res.placeholderImage.FillMode = canvas.ImageFillContain
 
+	res.thumbnailProgress.Start()
 	res.thumbnailProgress.Hide()
+	res.progressInfinite.Start()
 	res.progressInfinite.Hide()
 	res.progressDiscrete.Hide()
 	res.progressDiscrete.TextFormatter = func() string { return "" }
@@ -130,14 +132,14 @@ func NewEpisode(
 	res.thumbnailSize = fyne.NewSize(192, 108)
 	res.placeholderImage.SetMinSize(res.thumbnailSize)
 
-	thumbnail := container.NewMax(
+	thumbnail := container.NewStack(
 		res.placeholderImage,
 		res.thumbnailImageCnt,
 		res.thumbnailOverlay,
 		res.thumbnailText,
 		container.NewBorder(
 			nil,
-			container.NewMax(
+			container.NewStack(
 				res.thumbnailProgress,
 				res.progressInfinite,
 				res.progressDiscrete,

diff --git a/internal/gui/episodes.go b/internal/gui/episodes.go
@@ -147,7 +147,7 @@ func NewEpisodesPanel(
 
 			cleanupEpisodesFn := func() {}
 
-			episodes := container.NewMax()
+			episodes := container.NewStack()
 
 			seasonLists := make(map[sp.Language]*widget.List)
 			var selectedSeason atomic.Int32
@@ -185,7 +185,7 @@ func NewEpisodesPanel(
 				languageOpts[i] = v.String()
 			}
 
-			seasonsCnt := container.NewMax()
+			seasonsCnt := container.NewStack()
 
 			type searchQuery struct {
 				Language sp.Language
@@ -249,7 +249,7 @@ func NewEpisodesPanel(
 				split.SetOffset(0.1)
 			}
 
-			mainCnt := container.NewMax(split)
+			mainCnt := container.NewStack(split)
 
 			var clearSearchButton *widget.Button
 			var cleanupSearchResultsFns []func()

diff --git a/internal/gui/loadable.go b/internal/gui/loadable.go
@@ -30,17 +30,19 @@ func NewLoadable(
 	asyncFn func(ctx context.Context) (fyne.CanvasObject, error),
 	setClipboard func(string),
 ) *Loadable {
+	progress := widget.NewProgressBarInfinite()
+	progress.Start()
 	res := &Loadable{
 		loader: container.NewBorder(
-			widget.NewProgressBarInfinite(),
+			progress,
 			nil,
 			nil,
 			nil,
 		),
 		retryBtn: widget.NewButtonWithIcon("Retry", theme.ViewRefreshIcon(), func() {}),
 		errText:  widget.NewLabel(""),
 		copyBtn:  widget.NewButtonWithIcon("Copy", theme.ContentCopyIcon(), func() {}),
-		content:  container.NewMax(),
+		content:  container.NewStack(),
 	}
 	res.ExtendBaseWidget(res)
 
@@ -53,8 +55,7 @@ func NewLoadable(
 	}
 	res.copyBtn.Importance = widget.LowImportance
 
-	var task *asynctask.AsyncTask[struct{}, struct{}, fyne.CanvasObject]
-	task = asynctask.New(
+	task := asynctask.New(
 		ctx,
 		func(ctx context.Context, _ struct{}, _ func(struct{})) (fyne.CanvasObject, error) {
 			return asyncFn(ctx)
@@ -95,7 +96,7 @@ func NewLoadable(
 		nil,
 	)
 
-	res.obj = container.NewMax(res.loader, res.retry, res.content)
+	res.obj = container.NewStack(res.loader, res.retry, res.content)
 
 	res.loader.Show()
 	res.retry.Hide()