remove redundant CenterPad layout

dweymouth · May 25, 2024 · ceed42d · ceed42d
1 parent 819f42d
commit ceed42d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 47 deletions.
diff --git 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
diff --git 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
@@ -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]),