use rounded image corners (TODO: allow disabling this)

Author: dweymouth

ui/bottompanel.go

@@ -11,6 +11,7 @@ import (
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
 )
 
@@ -47,6 +48,7 @@ func NewBottomPanel(pm *backend.PlaybackManager, im *backend.ImageManager, contr
 	pm.OnStopped(util.FyneDoFunc(func() { bp.Controls.SetPlaying(false) }))
 
 	bp.NowPlaying = widgets.NewNowPlayingCard()
+	bp.NowPlaying.ImageCornerRadius = theme.InputRadiusSize()
 	bp.NowPlaying.OnCoverTapped = func() {
 		contr.NavigateTo(controller.NowPlayingRoute())
 	}

ui/browsing/albumpage.go

@@ -231,6 +231,7 @@ func NewAlbumPageHeader(page *AlbumPage) *AlbumPageHeader {
 	a.ExtendBaseWidget(a)
 	a.cover = widgets.NewImagePlaceholder(myTheme.AlbumIcon, 225)
 	a.cover.OnTapped = func(*fyne.PointEvent) { go a.showPopUpCover() }
+	a.cover.CornerRadius = theme.InputRadiusSize()
 
 	a.titleLabel = widget.NewRichTextWithText("")
 	a.titleLabel.Truncation = fyne.TextTruncateEllipsis

ui/browsing/artistpage.go

@@ -503,6 +503,7 @@ func NewArtistPageHeader(page *ArtistPage) *ArtistPageHeader {
 	}
 	a.artistImage = widgets.NewImagePlaceholder(myTheme.ArtistIcon, 225)
 	a.artistImage.OnTapped = func(*fyne.PointEvent) { a.showPopUpCover() }
+	a.artistImage.CornerRadius = theme.InputRadiusSize()
 	a.favoriteBtn = widgets.NewFavoriteButton(func() { go a.toggleFavorited() })
 	a.playBtn = widget.NewButtonWithIcon(lang.L("Play Discography"), theme.MediaPlayIcon(), func() {
 		go a.artistPage.pm.PlayArtistDiscography(a.artistID, false /*shuffle*/)

ui/browsing/nowplayingpage.go

@@ -108,6 +108,7 @@ func NewNowPlayingPage(
 	pm.OnStopped(doFmtStatus)
 
 	a.card = widgets.NewLargeNowPlayingCard()
+	a.card.ImageCornerRadius = theme.InputRadiusSize()
 	a.card.OnAlbumNameTapped = func() {
 		contr.NavigateTo(controller.AlbumRoute(a.nowPlaying.Metadata().AlbumID))
 	}

ui/browsing/playlistpage.go

@@ -328,6 +328,7 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
 
 	a.image = widgets.NewImagePlaceholder(myTheme.PlaylistIcon, 225)
 	a.image.OnTapped = func(*fyne.PointEvent) { go a.showPopUpCover() }
+	a.image.CornerRadius = theme.InputRadiusSize()
 	a.titleLabel = util.NewTruncatingRichText()
 	a.titleLabel.Segments[0].(*widget.TextSegment).Style = widget.RichTextStyle{
 		SizeName: theme.SizeNameHeadingText,

ui/theme/themedrectangle.go

@@ -15,11 +15,11 @@ type ThemedRectangle struct {
 
 	rect *canvas.Rectangle
 
-	ColorName        fyne.ThemeColorName
-	Translucent      bool
-	BorderWidth      float32
-	BorderColorName  fyne.ThemeColorName
-	CornerRadiusName fyne.ThemeSizeName
+	ColorName       fyne.ThemeColorName
+	Translucent     bool
+	BorderWidth     float32
+	BorderColorName fyne.ThemeColorName
+	CornerRadius    float32
 }
 
 func NewThemedRectangle(colorName fyne.ThemeColorName) *ThemedRectangle {
@@ -43,9 +43,7 @@ func (t *ThemedRectangle) Refresh() {
 	t.rect.FillColor = fc
 	t.rect.StrokeWidth = t.BorderWidth
 	t.rect.StrokeColor = theme.Color(t.BorderColorName, settings.ThemeVariant())
-	if t.CornerRadiusName != "" {
-		t.rect.CornerRadius = theme.Size(t.CornerRadiusName)
-	}
+	t.rect.CornerRadius = t.CornerRadius
 	t.BaseWidget.Refresh()
 }
 

ui/util/util.go

@@ -346,7 +346,7 @@ func AddHeaderBackground(obj fyne.CanvasObject) *fyne.Container {
 
 func AddHeaderBackgroundWithColorName(obj fyne.CanvasObject, colorName fyne.ThemeColorName) *fyne.Container {
 	bgrnd := myTheme.NewThemedRectangle(colorName)
-	bgrnd.CornerRadiusName = theme.SizeNameInputRadius
+	bgrnd.CornerRadius = theme.InputRadiusSize()
 	return container.NewStack(bgrnd,
 		container.New(&layout.CustomPaddedLayout{LeftPadding: 10, RightPadding: 10, TopPadding: 10, BottomPadding: 10},
 			obj))

ui/widgets/gridview.go

@@ -304,6 +304,7 @@ func (g *GridView) createGridWrap() {
 
 func (g *GridView) createNewItemCard() fyne.CanvasObject {
 	card := NewGridViewItem(g.Placeholder)
+	card.Cover.Im.CornerRadius = theme.InputRadiusSize()
 	card.SetSize(backend.AppInstance().Config.GridView.CardSize)
 	card.ItemIndex = -1
 	card.ImgLoader = util.NewThumbnailLoader(g.imageFetcher, card.Cover.SetImage)

ui/widgets/imageplaceholder.go

@@ -17,6 +17,7 @@ import (
 type ImagePlaceholder struct {
 	ScaleMode       canvas.ImageScale
 	PlaceholderIcon fyne.Resource
+	CornerRadius    float32
 
 	widget.BaseWidget
 	content   *fyne.Container
@@ -109,6 +110,8 @@ func (i *ImagePlaceholder) Refresh() {
 	i.imageDisp.Hidden = !i.HaveImage()
 	i.imageDisp.ScaleMode = i.ScaleMode
 	i.iconImage.ScaleMode = i.ScaleMode
+	i.imageDisp.CornerRadius = i.CornerRadius
+	i.border.CornerRadius = i.CornerRadius
 	i.BaseWidget.Refresh()
 }
 

ui/widgets/largenowplayingcard.go

@@ -19,7 +19,8 @@ import (
 type LargeNowPlayingCard struct {
 	CaptionedImage
 
-	DisableRating bool
+	DisableRating     bool
+	ImageCornerRadius float32
 
 	isRadio                 bool
 	trackName               *widget.RichText
@@ -163,5 +164,6 @@ func (n *LargeNowPlayingCard) Refresh() {
 	} else {
 		n.rating.Enable()
 	}
+	n.cover.CornerRadius = n.ImageCornerRadius
 	n.BaseWidget.Refresh()
 }