mirror of
https://github.com/mum4k/termdash.git
synced 2025-04-25 13:48:50 +08:00
Merge pull request #362 from spacez320/360-panic-when-attempting-to-use-backtab
Implement backtab for tcell widgets
This commit is contained in:
commit
b45b65fc1d
@ -1939,7 +1939,7 @@ func TestMouse(t *testing.T) {
|
|||||||
),
|
),
|
||||||
Right(
|
Right(
|
||||||
PlaceWidget(fakewidget.New(widgetapi.Options{WantKeyboard: widgetapi.KeyScopeFocused})),
|
PlaceWidget(fakewidget.New(widgetapi.Options{WantKeyboard: widgetapi.KeyScopeFocused})),
|
||||||
KeyFocusPrevious(keyboard.KeyTab),
|
KeyFocusPrevious(keyboard.KeyBacktab),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@ -1949,7 +1949,7 @@ func TestMouse(t *testing.T) {
|
|||||||
return c, nil
|
return c, nil
|
||||||
},
|
},
|
||||||
events: []terminalapi.Event{
|
events: []terminalapi.Event{
|
||||||
&terminalapi.Keyboard{Key: keyboard.KeyTab},
|
&terminalapi.Keyboard{Key: keyboard.KeyBacktab},
|
||||||
},
|
},
|
||||||
want: func(size image.Point) *faketerm.Terminal {
|
want: func(size image.Point) *faketerm.Terminal {
|
||||||
ft := faketerm.MustNew(size)
|
ft := faketerm.MustNew(size)
|
||||||
@ -1966,7 +1966,7 @@ func TestMouse(t *testing.T) {
|
|||||||
&widgetapi.Meta{Focused: true},
|
&widgetapi.Meta{Focused: true},
|
||||||
widgetapi.Options{WantKeyboard: widgetapi.KeyScopeFocused},
|
widgetapi.Options{WantKeyboard: widgetapi.KeyScopeFocused},
|
||||||
&fakewidget.Event{
|
&fakewidget.Event{
|
||||||
Ev: &terminalapi.Keyboard{Key: keyboard.KeyTab},
|
Ev: &terminalapi.Keyboard{Key: keyboard.KeyBacktab},
|
||||||
Meta: &widgetapi.EventMeta{Focused: true},
|
Meta: &widgetapi.EventMeta{Focused: true},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
@ -529,7 +529,7 @@ func TestFocusTrackerNextAndPrevious(t *testing.T) {
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
keyNext keyboard.Key = keyboard.KeyTab
|
keyNext keyboard.Key = keyboard.KeyTab
|
||||||
keyPrevious keyboard.Key = '~'
|
keyPrevious keyboard.Key = keyboard.KeyBacktab
|
||||||
)
|
)
|
||||||
|
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
|
@ -65,6 +65,7 @@ var buttonNames = map[Key]string{
|
|||||||
KeyCtrlG: "KeyCtrlG",
|
KeyCtrlG: "KeyCtrlG",
|
||||||
KeyBackspace: "KeyBackspace",
|
KeyBackspace: "KeyBackspace",
|
||||||
KeyTab: "KeyTab",
|
KeyTab: "KeyTab",
|
||||||
|
KeyBacktab: "KeyBacktab",
|
||||||
KeyCtrlJ: "KeyCtrlJ",
|
KeyCtrlJ: "KeyCtrlJ",
|
||||||
KeyCtrlK: "KeyCtrlK",
|
KeyCtrlK: "KeyCtrlK",
|
||||||
KeyCtrlL: "KeyCtrlL",
|
KeyCtrlL: "KeyCtrlL",
|
||||||
@ -130,6 +131,7 @@ const (
|
|||||||
KeyCtrlG
|
KeyCtrlG
|
||||||
KeyBackspace
|
KeyBackspace
|
||||||
KeyTab
|
KeyTab
|
||||||
|
KeyBacktab
|
||||||
KeyCtrlJ
|
KeyCtrlJ
|
||||||
KeyCtrlK
|
KeyCtrlK
|
||||||
KeyCtrlL
|
KeyCtrlL
|
||||||
|
@ -77,6 +77,7 @@ var tcellToTd = map[tcell.Key]keyboard.Key{
|
|||||||
tcell.KeyCtrlZ: keyboard.KeyCtrlZ,
|
tcell.KeyCtrlZ: keyboard.KeyCtrlZ,
|
||||||
tcell.KeyBackspace: keyboard.KeyBackspace,
|
tcell.KeyBackspace: keyboard.KeyBackspace,
|
||||||
tcell.KeyTab: keyboard.KeyTab,
|
tcell.KeyTab: keyboard.KeyTab,
|
||||||
|
tcell.KeyBacktab: keyboard.KeyBacktab,
|
||||||
tcell.KeyEscape: keyboard.KeyEsc,
|
tcell.KeyEscape: keyboard.KeyEsc,
|
||||||
tcell.KeyCtrlBackslash: keyboard.KeyCtrlBackslash,
|
tcell.KeyCtrlBackslash: keyboard.KeyCtrlBackslash,
|
||||||
tcell.KeyCtrlRightSq: keyboard.KeyCtrlRsqBracket,
|
tcell.KeyCtrlRightSq: keyboard.KeyCtrlRsqBracket,
|
||||||
|
@ -218,6 +218,7 @@ func TestKeyboardKeys(t *testing.T) {
|
|||||||
{key: tcell.KeyBackspace, want: keyboard.KeyCtrlH},
|
{key: tcell.KeyBackspace, want: keyboard.KeyCtrlH},
|
||||||
{key: tcell.KeyCtrlH, want: keyboard.KeyBackspace},
|
{key: tcell.KeyCtrlH, want: keyboard.KeyBackspace},
|
||||||
{key: tcell.KeyTab, want: keyboard.KeyTab},
|
{key: tcell.KeyTab, want: keyboard.KeyTab},
|
||||||
|
{key: tcell.KeyBacktab, want: keyboard.KeyBacktab},
|
||||||
{key: tcell.KeyTab, want: keyboard.KeyCtrlI},
|
{key: tcell.KeyTab, want: keyboard.KeyCtrlI},
|
||||||
{key: tcell.KeyCtrlI, want: keyboard.KeyTab},
|
{key: tcell.KeyCtrlI, want: keyboard.KeyTab},
|
||||||
{key: tcell.KeyCtrlJ, want: keyboard.KeyCtrlJ},
|
{key: tcell.KeyCtrlJ, want: keyboard.KeyCtrlJ},
|
||||||
|
@ -167,6 +167,7 @@ func newForm(cancel context.CancelFunc) (*form, error) {
|
|||||||
func formLayout(c *container.Container, f *form) error {
|
func formLayout(c *container.Container, f *form) error {
|
||||||
return c.Update("root",
|
return c.Update("root",
|
||||||
container.KeyFocusNext(keyboard.KeyTab),
|
container.KeyFocusNext(keyboard.KeyTab),
|
||||||
|
container.KeyFocusPrevious(keyboard.KeyBacktab),
|
||||||
container.KeyFocusGroupsNext(keyboard.KeyArrowDown, 1),
|
container.KeyFocusGroupsNext(keyboard.KeyArrowDown, 1),
|
||||||
container.KeyFocusGroupsPrevious(keyboard.KeyArrowUp, 1),
|
container.KeyFocusGroupsPrevious(keyboard.KeyArrowUp, 1),
|
||||||
container.KeyFocusGroupsNext(keyboard.KeyArrowRight, 2),
|
container.KeyFocusGroupsNext(keyboard.KeyArrowRight, 2),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user