From 042f602ddb1837e36cfb86c74906f2256e660f08 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Sat, 25 May 2019 15:19:18 -0700 Subject: [PATCH] Tabbing to widgets properly sets the IsFocused property. Closes #467 --- modules/todo/keyboard.go | 2 +- wtf/focus_tracker.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/todo/keyboard.go b/modules/todo/keyboard.go index 8706d74f..a24fc083 100644 --- a/modules/todo/keyboard.go +++ b/modules/todo/keyboard.go @@ -10,7 +10,7 @@ import ( func (widget *Widget) initializeKeyboardControls() { widget.SetKeyboardChar("/", widget.ShowHelp, "Show/hide this help prompt") - widget.SetKeyboardChar(" ", widget.Refresh, "Refresh widget") + widget.SetKeyboardChar("r", widget.Refresh, "Refresh widget") widget.SetKeyboardChar("j", widget.displayNext, "Select next item") widget.SetKeyboardChar("k", widget.displayPrev, "Select previous item") widget.SetKeyboardChar(" ", widget.toggleChecked, "Toggle checkmark") diff --git a/wtf/focus_tracker.go b/wtf/focus_tracker.go index 14388984..27829181 100644 --- a/wtf/focus_tracker.go +++ b/wtf/focus_tracker.go @@ -79,6 +79,8 @@ func (tracker *FocusTracker) Next() { tracker.blur(tracker.Idx) tracker.increment() tracker.focus(tracker.Idx) + + tracker.IsFocused = true } // None removes focus from the currently-focused widget. @@ -100,6 +102,8 @@ func (tracker *FocusTracker) Prev() { tracker.blur(tracker.Idx) tracker.decrement() tracker.focus(tracker.Idx) + + tracker.IsFocused = true } func (tracker *FocusTracker) Refocus() {