fix regression: add back OnTapped handler to artist image
This commit is contained in:
@@ -253,6 +253,11 @@ func NewArtistPageHeader(page *ArtistPage) *ArtistPageHeader {
|
|||||||
SizeName: theme.SizeNameHeadingText,
|
SizeName: theme.SizeNameHeadingText,
|
||||||
}
|
}
|
||||||
a.artistImage = widgets.NewImagePlaceholder(res.ResPeopleInvertPng, 225)
|
a.artistImage = widgets.NewImagePlaceholder(res.ResPeopleInvertPng, 225)
|
||||||
|
a.artistImage.OnTapped = func() {
|
||||||
|
if im := a.artistImage.Image(); im != nil {
|
||||||
|
a.artistPage.contr.ShowPopUpImage(im)
|
||||||
|
}
|
||||||
|
}
|
||||||
a.favoriteBtn = widgets.NewFavoriteButton(func() { go a.toggleFavorited() })
|
a.favoriteBtn = widgets.NewFavoriteButton(func() { go a.toggleFavorited() })
|
||||||
a.playBtn = widget.NewButtonWithIcon("Play Discography", theme.MediaPlayIcon(), page.playAllTracks)
|
a.playBtn = widget.NewButtonWithIcon("Play Discography", theme.MediaPlayIcon(), page.playAllTracks)
|
||||||
a.playRadioBtn = widget.NewButtonWithIcon("Play Artist Radio", res.ResShuffleInvertSvg, page.playArtistRadio)
|
a.playRadioBtn = widget.NewButtonWithIcon("Play Artist Radio", res.ResShuffleInvertSvg, page.playArtistRadio)
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
type ImagePlaceholder struct {
|
type ImagePlaceholder struct {
|
||||||
widget.BaseWidget
|
widget.BaseWidget
|
||||||
container *fyne.Container
|
container *fyne.Container
|
||||||
haveImage bool
|
image image.Image
|
||||||
minSize float32
|
minSize float32
|
||||||
|
|
||||||
OnTapped func()
|
OnTapped func()
|
||||||
@@ -44,11 +44,12 @@ type CanvasImage interface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (i *ImagePlaceholder) HaveImage() bool {
|
func (i *ImagePlaceholder) HaveImage() bool {
|
||||||
return i.haveImage
|
return i.image != nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *ImagePlaceholder) SetImage(img image.Image, tappable bool) {
|
func (i *ImagePlaceholder) SetImage(img image.Image, tappable bool) {
|
||||||
var cIm CanvasImage
|
var cIm CanvasImage
|
||||||
|
i.image = img
|
||||||
if tappable {
|
if tappable {
|
||||||
cImg := NewTappableImage(i.onTapped)
|
cImg := NewTappableImage(i.onTapped)
|
||||||
cImg.Image.Image = img
|
cImg.Image.Image = img
|
||||||
@@ -63,7 +64,10 @@ func (i *ImagePlaceholder) SetImage(img image.Image, tappable bool) {
|
|||||||
i.container.RemoveAll()
|
i.container.RemoveAll()
|
||||||
i.container.Add(cIm)
|
i.container.Add(cIm)
|
||||||
i.container.Refresh()
|
i.container.Refresh()
|
||||||
i.haveImage = true
|
}
|
||||||
|
|
||||||
|
func (i *ImagePlaceholder) Image() image.Image {
|
||||||
|
return i.image
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *ImagePlaceholder) onTapped() {
|
func (i *ImagePlaceholder) onTapped() {
|
||||||
|
|||||||
Reference in New Issue
Block a user