owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more restrictions to year entry field in album filters

Browse Source
This commit is contained in:
Drew Weymouth
2023-05-18 08:56:55 -07:00
parent d7506ca630
commit bf4dce6df4
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/widgets/albumfilterbutton.go
+2 -1
View File
@@ -88,7 +88,8 @@ func NewAlbumFilterPopup(filter *AlbumFilterButton) *AlbumFilterPopup {
// setup min and max year filters // setup min and max year filters
yearValidator := func(curText, selText string, r rune) bool { yearValidator := func(curText, selText string, r rune) bool {
return unicode.IsDigit(r) && (len(selText) > 0 || len(curText) <= 3) l := len(curText) - len(selText)
return unicode.IsDigit(r) && l <= 3 && (l > 0 || r != '0')
} }
minYear := NewTextRestrictedEntry(yearValidator) minYear := NewTextRestrictedEntry(yearValidator)
minYear.SetMinCharWidth(4) minYear.SetMinCharWidth(4)
ui/widgets/textrestrictedentry.go
+7
View File
@@ -32,6 +32,13 @@ func (e *TextRestrictedEntry) TypedRune(r rune) {
} }
} }
func (e *TextRestrictedEntry) TypedShortcut(s fyne.Shortcut) {
if s.ShortcutName() == (&fyne.ShortcutPaste{}).ShortcutName() {
return
}
e.TypedShortcut(s)
}
func (e *TextRestrictedEntry) SetMinCharWidth(numChars int) { func (e *TextRestrictedEntry) SetMinCharWidth(numChars int) {
e.minWidth = theme.Padding()*2 + fyne.MeasureText(strings.Repeat("W", numChars), e.minWidth = theme.Padding()*2 + fyne.MeasureText(strings.Repeat("W", numChars),
fyne.CurrentApp().Settings().Theme().Size(theme.SizeNameText), e.TextStyle).Width fyne.CurrentApp().Settings().Theme().Size(theme.SizeNameText), e.TextStyle).Width