From: Simon Tatham <anakin@pobox.com>
Date: Sat, 3 Feb 2024 09:40:05 +0000 (+0000)
Subject: Fix keystrokes in options menus.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=21da9165f01ce2ba7f962e4bc1f5b4afcc2fbce7;p=mastodonochrome.git

Fix keystrokes in options menus.

The status line advertised [RET] as a way to get out of the menu, but
handle_keypress() only supported [Q]. Now it supports [RET] too.

Also, [SPACE] is the keypress to submit changes to user-related
options, but the status line forgot to mention it at all! Now it does.
---

diff --git a/src/options.rs b/src/options.rs
index b58c90d..9be67ae 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -45,8 +45,10 @@ impl YourOptionsMenu {
             "HHHHHHHHHHHHHHHHHHHKKKHHKHHKH",
         ));
 
-        let normal_status =
-            FileStatusLine::new().add(Return, "Back", 10).finalise();
+        let normal_status = FileStatusLine::new()
+            .add(Return, "Back", 10)
+            .add(Space, "Submit Changes", 15)
+            .finalise();
         let edit_status = FileStatusLine::new()
             .message("Edit line and press Return")
             .finalise();
@@ -268,7 +270,7 @@ impl ActivityState for YourOptionsMenu {
 
         match key {
             Space => self.submit(client),
-            Pr('q') | Pr('Q') => LogicalAction::Pop,
+            Pr('q') | Pr('Q') | Return => LogicalAction::Pop,
             Pr('n') | Pr('N') => self.el_display_name.start_editing(),
             Pr('v') | Pr('V') => self.cl_default_vis.cycle(),
             Pr('l') | Pr('L') => self.el_default_language.start_editing(),
@@ -345,8 +347,10 @@ impl OtherUserOptionsMenu {
             'H',
         ));
 
-        let normal_status =
-            FileStatusLine::new().add(Return, "Back", 10).finalise();
+        let normal_status = FileStatusLine::new()
+            .add(Return, "Back", 10)
+            .add(Space, "Submit Changes", 15)
+            .finalise();
         let edit_status = FileStatusLine::new()
             .message("Edit line and press Return")
             .finalise();
@@ -533,7 +537,7 @@ impl ActivityState for OtherUserOptionsMenu {
 
         match key {
             Space => self.submit(client),
-            Pr('q') | Pr('Q') => LogicalAction::Pop,
+            Pr('q') | Pr('Q') | Return => LogicalAction::Pop,
             Pr('f') | Pr('F') => self.cl_follow.cycle(),
             Pr('b') | Pr('B') => self.cl_boosts.cycle(),
             Pr('l') | Pr('L') => self.el_languages.start_editing(),