git.iko.soy/crush
on main help sign in
fix(ui): don't use separate showFullHelp field
aec65c4Ayman Bagabas
internal/ui/model/ui.go+3−5
compare with main
unifiedsplit
@@ -25,8 +25,7 @@ type UI struct {
25 app *app.App
25 app *app.App
26 com *common.Common
26 com *common.Common
27
27
28− state uiState
28+ state uiState
29− showFullHelp bool
30
29
31 keyMap KeyMap
30 keyMap KeyMap
32
31
@@ -74,8 +73,7 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
74 cmds = append(cmds, m.editor.Blur())
73 cmds = append(cmds, m.editor.Blur())
75 }
74 }
76 case key.Matches(msg, m.keyMap.Help):
75 case key.Matches(msg, m.keyMap.Help):
77− m.showFullHelp = !m.showFullHelp
78− m.help.ShowAll = m.showFullHelp
76+ m.help.ShowAll = !m.help.ShowAll
79 m.updateLayout(m.layout.area.Dx(), m.layout.area.Dy())
77 m.updateLayout(m.layout.area.Dx(), m.layout.area.Dy())
80 case key.Matches(msg, m.keyMap.Quit):
78 case key.Matches(msg, m.keyMap.Quit):
81 if !m.dialog.ContainsDialog(dialog.QuitDialogID) {
79 if !m.dialog.ContainsDialog(dialog.QuitDialogID) {
@@ -218,7 +216,7 @@ func (m *UI) updateLayout(w, h int) {
218 if m.dialog.HasDialogs() && len(m.dialog.FullHelp()) > 0 && len(m.dialog.ShortHelp()) > 0 {
216 if m.dialog.HasDialogs() && len(m.dialog.FullHelp()) > 0 && len(m.dialog.ShortHelp()) > 0 {
219 helpKeyMap = m.dialog
217 helpKeyMap = m.dialog
220 }
218 }
221− if m.showFullHelp {
219+ if m.help.ShowAll {
222 for _, row := range helpKeyMap.FullHelp() {
220 for _, row := range helpKeyMap.FullHelp() {
223 helpHeight = max(helpHeight, len(row))
221 helpHeight = max(helpHeight, len(row))
224 }
222 }