diff --git a/canvasobject.go b/canvasobject.go index 971620f3f8..fb8fe22f17 100644 --- a/canvasobject.go +++ b/canvasobject.go @@ -97,11 +97,11 @@ type Shortcutable interface { TypedShortcut(Shortcut) } -// Tabable describes any object that needs to accept the Tab key presses. +// Tabbable describes any object that needs to accept the Tab key presses. // // Since: 2.1 -type Tabable interface { - // AcceptTabs() is a hook called by the key press handling logic. - // If it returns true then the Tab key events will be sent TypedKey and TypedRune. - AcceptTabs() bool +type Tabbable interface { + // AcceptsTab() is a hook called by the key press handling logic. + // If it returns true then the Tab key events will be sent using TypedKey. + AcceptsTab() bool } diff --git a/internal/driver/glfw/window.go b/internal/driver/glfw/window.go index f2be18187e..de88d0d9dd 100644 --- a/internal/driver/glfw/window.go +++ b/internal/driver/glfw/window.go @@ -1001,7 +1001,7 @@ func keyToName(code glfw.Key, scancode int) fyne.KeyName { func (w *window) capturesTab(keyName fyne.KeyName, modifier desktop.Modifier) bool { if keyName == fyne.KeyTab { - if ent, ok := w.canvas.Focused().(fyne.Tabable); ok && !ent.AcceptTabs() { + if ent, ok := w.canvas.Focused().(fyne.Tabbable); ok && !ent.AcceptsTab() { switch modifier { case 0: w.canvas.FocusNext() diff --git a/widget/entry.go b/widget/entry.go index 16e576a527..ab55107275 100644 --- a/widget/entry.go +++ b/widget/entry.go @@ -30,7 +30,7 @@ var _ fyne.Widget = (*Entry)(nil) var _ desktop.Mouseable = (*Entry)(nil) var _ desktop.Keyable = (*Entry)(nil) var _ mobile.Keyboardable = (*Entry)(nil) -var _ fyne.Tabable = (*Entry)(nil) +var _ fyne.Tabbable = (*Entry)(nil) // Entry widget allows simple text to be input when focused. type Entry struct { @@ -116,12 +116,12 @@ func NewPasswordEntry() *Entry { return e } -// AcceptTabs returns if Entry accepts Tabs or not. +// AcceptsTab returns if Entry accepts the Tab key or not. // -// Implements: fyne.Tabable +// Implements: fyne.Tabbable // // Since: 2.1 -func (e *Entry) AcceptTabs() bool { +func (e *Entry) AcceptsTab() bool { return e.MultiLine } diff --git a/widget/entry_test.go b/widget/entry_test.go index 5fac2e86e4..3e2e77b14b 100644 --- a/widget/entry_test.go +++ b/widget/entry_test.go @@ -1371,7 +1371,7 @@ func TestTabable(t *testing.T) { }) t.Run("Singleline_Tab_Default", func(t *testing.T) { entry.MultiLine = false - assert.False(t, entry.AcceptTabs()) + assert.False(t, entry.AcceptsTab()) }) }