quick minSize optimizations

This commit is contained in:
Drew Weymouth
2023-04-02 10:40:55 -07:00
parent 9fc28b9389
commit 7164fa15c6
2 changed files with 6 additions and 13 deletions
+1 -3
View File
@@ -35,7 +35,6 @@ type AlbumsPage struct {
type selectWidget struct {
widget.Select
height float32
}
func NewSelect(options []string, onChanged func(string)) *selectWidget {
@@ -45,13 +44,12 @@ func NewSelect(options []string, onChanged func(string)) *selectWidget {
OnChanged: onChanged,
},
}
s.height = widget.NewSelect(nil, nil).MinSize().Height
s.ExtendBaseWidget(s)
return s
}
func (s *selectWidget) MinSize() fyne.Size {
return fyne.NewSize(170, s.height)
return fyne.NewSize(170, s.Select.MinSize().Height)
}
func NewAlbumsPage(cfg *backend.AlbumsPageConfig, contr *controller.Controller, pm *backend.PlaybackManager, lm *backend.LibraryManager, im *backend.ImageManager) *AlbumsPage {
+5 -10
View File
@@ -71,20 +71,15 @@ func (s *Searcher) sendSearch(text string) {
type SearchEntry struct {
widget.Entry
height float32
}
func NewSearchEntry() *SearchEntry {
sf := &SearchEntry{}
sf.ExtendBaseWidget(sf)
// this is a bit hacky
sf.height = widget.NewEntry().MinSize().Height
sf.PlaceHolder = "Search"
c := NewClearTextButton()
c.OnTapped = func() {
sf.ActionItem = NewClearTextButton(func() {
sf.SetText("")
}
sf.ActionItem = c
})
return sf
}
@@ -98,7 +93,7 @@ func (s *SearchEntry) Refresh() {
}
func (s *SearchEntry) MinSize() fyne.Size {
return fyne.NewSize(200, s.height)
return fyne.NewSize(200, s.Entry.MinSize().Height)
}
var _ fyne.Tappable = (*clearTextButton)(nil)
@@ -109,8 +104,8 @@ type clearTextButton struct {
OnTapped func()
}
func NewClearTextButton() *clearTextButton {
c := &clearTextButton{}
func NewClearTextButton(onTapped func()) *clearTextButton {
c := &clearTextButton{OnTapped: onTapped}
c.ExtendBaseWidget(c)
c.Resource = theme.SearchIcon()
return c