From a324177fefdabcc45c15a73e825a84bf10b915e6 Mon Sep 17 00:00:00 2001 From: Drew Weymouth Date: Mon, 19 Jun 2023 19:22:47 -0700 Subject: [PATCH] adjust layout of aux controls --- ui/widgets/auxcontrols.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/ui/widgets/auxcontrols.go b/ui/widgets/auxcontrols.go index eb0cca5..b110a66 100644 --- a/ui/widgets/auxcontrols.go +++ b/ui/widgets/auxcontrols.go @@ -6,6 +6,7 @@ import ( "fyne.io/fyne/v2/layout" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" + "github.com/dweymouth/supersonic/ui/util" ) // The "aux" controls for playback, positioned to the right @@ -14,22 +15,41 @@ type AuxControls struct { widget.BaseWidget VolumeControl *VolumeControl - loop *widget.Button + loop *miniButton container *fyne.Container } +type miniButton struct { + widget.Button +} + +func newMiniButton(icon fyne.Resource) *miniButton { + b := &miniButton{ + Button: widget.Button{ + Icon: icon, + }, + } + b.ExtendBaseWidget(b) + return b +} + +func (b *miniButton) MinSize() fyne.Size { + return fyne.NewSize(24, 24) +} + func NewAuxControls(initialVolume int) *AuxControls { a := &AuxControls{ VolumeControl: NewVolumeControl(initialVolume), - loop: widget.NewButtonWithIcon("", theme.MediaReplayIcon(), func() {}), + loop: newMiniButton(theme.MediaReplayIcon()), } a.container = container.NewHBox( layout.NewSpacer(), container.NewVBox( + util.NewHSpace(0), // hack to move everything down a tiny bit layout.NewSpacer(), a.VolumeControl, - container.NewCenter(layout.NewSpacer(), a.loop), + container.NewHBox(layout.NewSpacer(), a.loop, util.NewHSpace(5)), layout.NewSpacer(), ), )