From ceed42dcf2227a33127c1cc34fcc13d28d789cd0 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Fri, 24 May 2024 17:07:44 -0700
Subject: [PATCH] remove redundant CenterPad layout

---
 ui/dialogs/aboutdialog.go     |  3 +--
 ui/layouts/centerpadlayout.go | 39 -----------------------------------
 ui/widgets/gridviewitem.go    |  3 +--
 ui/widgets/loadingdots.go     |  6 ++----
 4 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 ui/layouts/centerpadlayout.go

diff --git a/ui/dialogs/aboutdialog.go b/ui/dialogs/aboutdialog.go
index 0d3e218..d79b393 100644
--- a/ui/dialogs/aboutdialog.go
+++ b/ui/dialogs/aboutdialog.go
@@ -5,7 +5,6 @@ import (
 	"net/url"
 
 	"github.com/dweymouth/supersonic/res"
-	"github.com/dweymouth/supersonic/ui/layouts"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
@@ -75,7 +74,7 @@ func (a *AboutDialog) buildMainTabContainer(version string) *fyne.Container {
 			widget.NewHyperlink("Support the project", kofiUrl)),
 	)
 
-	return container.New(&layouts.CenterPadLayout{PadTopBottom: 10},
+	return container.New(&layout.CustomPaddedLayout{TopPadding: 10, BottomPadding: 10},
 		container.NewVBox(iconImage,
 			container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-10), title, versionLbl, copyright, license, githubKofi)))
 }
diff --git a/ui/layouts/centerpadlayout.go b/ui/layouts/centerpadlayout.go
deleted file mode 100644
index 71caafd..0000000
--- a/ui/layouts/centerpadlayout.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package layouts
-
-import (
-	"fyne.io/fyne/v2"
-)
-
-var _ fyne.Layout = (*CenterPadLayout)(nil)
-
-type CenterPadLayout struct {
-	PadLeftRight float32
-	PadTopBottom float32
-}
-
-// only supports one object
-func (c *CenterPadLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
-	if len(objects) == 0 {
-		return fyne.NewSize(0, 0)
-	}
-	return fyne.Size{
-		Width:  objects[0].MinSize().Width + c.PadLeftRight*2,
-		Height: objects[0].MinSize().Height + c.PadTopBottom*2,
-	}
-}
-
-func (c *CenterPadLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
-	if len(objects) == 0 {
-		return
-	}
-	objSize := objects[0].MinSize()
-	xOffs := (size.Width - objSize.Width) / 2
-	yOffs := (size.Height - objSize.Height) / 2
-	for _, child := range objects {
-		if !child.Visible() {
-			continue
-		}
-		child.Move(fyne.NewPos(xOffs, yOffs))
-		child.Resize(child.MinSize())
-	}
-}
diff --git a/ui/widgets/gridviewitem.go b/ui/widgets/gridviewitem.go
index f3d99a8..d497441 100644
--- a/ui/widgets/gridviewitem.go
+++ b/ui/widgets/gridviewitem.go
@@ -6,7 +6,6 @@ import (
 	"slices"
 
 	"github.com/dweymouth/supersonic/res"
-	"github.com/dweymouth/supersonic/ui/layouts"
 	"github.com/dweymouth/supersonic/ui/util"
 
 	"fyne.io/fyne/v2"
@@ -201,7 +200,7 @@ func (g *GridViewItem) createContainer() {
 	g.focusRect.StrokeWidth = 3
 	coverStack := container.NewStack(g.Cover, g.focusRect)
 	c := container.New(layout.NewCustomPaddedVBoxLayout(theme.Padding()-5), coverStack, info)
-	pad := &layouts.CenterPadLayout{PadLeftRight: 20, PadTopBottom: 10}
+	pad := layout.NewCustomPaddedLayout(10, 10, 20, 20)
 	g.container = container.New(pad, c)
 }
 
diff --git a/ui/widgets/loadingdots.go b/ui/widgets/loadingdots.go
index 283edf8..17dd2ed 100644
--- a/ui/widgets/loadingdots.go
+++ b/ui/widgets/loadingdots.go
@@ -9,9 +9,9 @@ import (
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
-	"github.com/dweymouth/supersonic/ui/layouts"
 )
 
 type LoadingDots struct {
@@ -92,9 +92,7 @@ func (l *LoadingDots) doTick(foreground, disabled color.Color) {
 
 func (l *LoadingDots) CreateRenderer() fyne.WidgetRenderer {
 	if l.container == nil {
-		layout := &layouts.CenterPadLayout{
-			PadLeftRight: 3,
-		}
+		layout := layout.NewCustomPaddedLayout(0, 0, 3, 3)
 		l.container = container.NewHBox(
 			container.New(layout, &l.dots[0]),
 			container.New(layout, &l.dots[1]),