ui refactoring (create controller pkg) + beginning of add to playlist

This commit is contained in:
Drew Weymouth
2023-02-09 18:59:49 -08:00
parent 46c87944db
commit cd6dce5e3f
6 changed files with 109 additions and 74 deletions
-22
View File
@@ -7,7 +7,6 @@ import (
"strings"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/canvas"
"fyne.io/fyne/v2/widget"
"golang.org/x/net/html"
)
@@ -33,27 +32,6 @@ type PopUpProvider interface {
WindowSize() fyne.Size
}
func ShowPopUpImage(img image.Image, popUpProvider PopUpProvider) {
im := canvas.NewImageFromImage(img)
im.FillMode = canvas.ImageFillContain
pop := popUpProvider.CreatePopUp(im)
s := popUpProvider.WindowSize()
var popS fyne.Size
if asp := ImageAspect(img); s.Width/s.Height > asp {
// window height is limiting factor
h := s.Height * 0.8
popS = fyne.NewSize(h*asp, h)
} else {
w := s.Width * 0.8
popS = fyne.NewSize(w, w*(1/asp))
}
pop.Resize(popS)
pop.ShowAtPosition(fyne.NewPos(
(s.Width-popS.Width)/2,
(s.Height-popS.Height)/2,
))
}
func RichTextSegsFromHTMLString(s string) []widget.RichTextSegment {
tokr := html.NewTokenizer(strings.NewReader(s))
var segs []widget.RichTextSegment