From 813c19dd4f4fae1c6b4ed166edf2044516508dc6 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Fri, 18 Apr 2025 21:33:58 +0200 Subject: Use "ctrl+c" for quitting on play --- pkg/ui/views/game_keymap.go | 2 +- pkg/ui/views/play_keymap.go | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pkg/ui/views/game_keymap.go b/pkg/ui/views/game_keymap.go index 283a69c..ceacfc1 100644 --- a/pkg/ui/views/game_keymap.go +++ b/pkg/ui/views/game_keymap.go @@ -28,7 +28,7 @@ var defaultGameKeyMap = gameKeyMap{ ), Exit: key.NewBinding( key.WithKeys("ctrl+c", "ctrl+C"), - key.WithHelp("CTRL+C", "Exit"), + key.WithHelp("Ctrl+C", "Exit"), ), } diff --git a/pkg/ui/views/play_keymap.go b/pkg/ui/views/play_keymap.go index fa3caec..24d5307 100644 --- a/pkg/ui/views/play_keymap.go +++ b/pkg/ui/views/play_keymap.go @@ -25,9 +25,9 @@ type playKeyMap struct { StartNewGame key.Binding RestoreGame key.Binding GoLogout key.Binding - Quit key.Binding NextPage key.Binding PrevPage key.Binding + Exit key.Binding } // Default key bindings for the play model @@ -48,10 +48,6 @@ var defaultPlayKeyMap = playKeyMap{ key.WithKeys("alt+Q", "alt+q"), key.WithHelp("Alt+Q", "Logout"), ), - Quit: key.NewBinding( - key.WithKeys("Q", "q"), - key.WithHelp(" Q", "Quit"), - ), NextPage: key.NewBinding( key.WithKeys("right"), key.WithHelp("→/h", "Next Page"), @@ -60,6 +56,10 @@ var defaultPlayKeyMap = playKeyMap{ key.WithKeys("left"), key.WithHelp("←/l", "Prev Page"), ), + Exit: key.NewBinding( + key.WithKeys("ctrl+c", "ctrl+C"), + key.WithHelp("Ctrl+C", "Exit"), + ), } func (m PlayModel) handleKeyPress(msg tea.KeyMsg) (tea.Model, tea.Cmd) { @@ -103,9 +103,6 @@ func (m PlayModel) handleKeyPress(msg tea.KeyMsg) (tea.Model, tea.Cmd) { case key.Matches(msg, m.keys.GoLogout): return m, logout(m.width, m.height+1) - case key.Matches(msg, m.keys.Quit): - return m, tea.Quit - case msg.Type == tea.KeyEnter: if m.page == InsertCodePage && !m.isLoading { m.isLoading = true @@ -128,9 +125,9 @@ func (m PlayModel) renderNavigationButtons() string { altCodeStyle.Render(m.keys.GoLogout.Help().Key), m.keys.GoLogout.Help().Desc) - quitKey := fmt.Sprintf("%s %s", - altCodeStyle.Render(m.keys.Quit.Help().Key), - m.keys.Quit.Help().Desc) + exitKey := fmt.Sprintf("%s %s", + altCodeStyle.Render(m.keys.Exit.Help().Key), + m.keys.Exit.Help().Desc) if m.page == LandingPage { enterKey := fmt.Sprintf("%s %s", @@ -160,13 +157,13 @@ func (m PlayModel) renderNavigationButtons() string { restoreKey, lipgloss.JoinHorizontal(lipgloss.Left, prevPageKey, " | ", nextPageKey), logoutKey, - quitKey, + exitKey, ) } return lipgloss.JoinVertical( lipgloss.Left, logoutKey, - quitKey, + exitKey, ) } -- cgit v1.2.3-18-g5258