martyn
/
fyne-widgets
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch outline to mask

This commit is contained in:
Martyn 2021-12-24 00:11:44 +00:00
parent 5a8a14f63d
commit a5819955f7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/profilebtn/profilebtn.go
View File

@ -31,7 +31,6 @@ func (b *profileBtn) CreateRenderer() fyne.WidgetRenderer {
func NewProfileBtnRenderer(b *profileBtn) *profileBtnRenderer { func NewProfileBtnRenderer(b *profileBtn) *profileBtnRenderer {
r := &profileBtnRenderer{ r := &profileBtnRenderer{
canvas.NewRasterFromImage(image.NewRGBA(image.Rect(0, 0, 10, 10))), canvas.NewRasterFromImage(image.NewRGBA(image.Rect(0, 0, 10, 10))),
canvas.NewCircle(b.OutlineColor),
b, b,
} }
b.ExtendBaseWidget(b) b.ExtendBaseWidget(b)
@ -55,9 +54,8 @@ func (b *profileBtn) SetProfileImage(i image.Image) {
} }
type profileBtnRenderer struct { type profileBtnRenderer struct {
rast *canvas.Raster rast *canvas.Raster
background *canvas.Circle w *profileBtn
w *profileBtn
} }
func min(x, y int) int { func min(x, y int) int {
@ -78,7 +76,9 @@ func (r *profileBtnRenderer) Render(w, h int) image.Image {
if r.w.profileImage != nil { if r.w.profileImage != nil {
src := r.w.profileImage src := r.w.profileImage
b := src.Bounds().Size() b := src.Bounds().Size()
wh := image.NewUniform(r.w.OutlineColor)
dst := image.NewRGBA(image.Rect(0, 0, b.X, b.Y)) dst := image.NewRGBA(image.Rect(0, 0, b.X, b.Y))
draw.DrawMask(dst, dst.Bounds(), wh, image.ZP, &circle{image.Point{b.X / 2, b.Y / 2}, (min(b.Y, b.Y) / 2)}, image.ZP, draw.Over)
draw.DrawMask(dst, dst.Bounds(), src, image.ZP, &circle{image.Point{b.X / 2, b.Y / 2}, (min(b.Y, b.Y) / 2) - r.w.OutlineWidth}, image.ZP, draw.Over) draw.DrawMask(dst, dst.Bounds(), src, image.ZP, &circle{image.Point{b.X / 2, b.Y / 2}, (min(b.Y, b.Y) / 2) - r.w.OutlineWidth}, image.ZP, draw.Over)
return dst return dst
} else { } else {
@ -91,7 +91,6 @@ func (r *profileBtnRenderer) MinSize() fyne.Size {
} }
func (r *profileBtnRenderer) Layout(size fyne.Size) { func (r *profileBtnRenderer) Layout(size fyne.Size) {
r.background.Resize(size)
squareSize := fyne.NewSize(minf(size.Width, size.Height), minf(size.Width, size.Height)) squareSize := fyne.NewSize(minf(size.Width, size.Height), minf(size.Width, size.Height))
r.rast.Resize(squareSize) r.rast.Resize(squareSize)
if squareSize.Width < size.Width { if squareSize.Width < size.Width {
@ -119,5 +118,5 @@ func (r *profileBtnRenderer) Destroy() {
func (r *profileBtnRenderer) Objects() []fyne.CanvasObject { func (r *profileBtnRenderer) Objects() []fyne.CanvasObject {
r.Refresh() r.Refresh()
return []fyne.CanvasObject{r.background, r.rast} return []fyne.CanvasObject{r.rast}
} }