From 923ff93c9e00d8cf146f9a1d9a8e14a1736636a9 Mon Sep 17 00:00:00 2001 From: Noah Yorgey Date: Mon, 17 Jul 2023 11:19:42 -0400 Subject: [PATCH 1/3] Change binding on Hide REPL to ^s --- src/Swarm/TUI/Controller.hs | 2 +- src/Swarm/TUI/View.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Swarm/TUI/Controller.hs b/src/Swarm/TUI/Controller.hs index bc3874996..5f4c73c29 100644 --- a/src/Swarm/TUI/Controller.hs +++ b/src/Swarm/TUI/Controller.hs @@ -387,7 +387,7 @@ handleMainEvent ev = do -- Paint with the World Editor EC.handleCtrlLeftClick mouseLoc -- toggle collapse/expand REPL - ControlChar 's' -> do + ControlChar ',' -> do invalidateCacheEntry WorldCache uiState . uiShowREPL %= not MouseDown n _ _ mouseLoc -> diff --git a/src/Swarm/TUI/View.hs b/src/Swarm/TUI/View.hs index ce55ddb61..6008ac7ed 100644 --- a/src/Swarm/TUI/View.hs +++ b/src/Swarm/TUI/View.hs @@ -929,7 +929,7 @@ drawKeyMenu s = , may isPaused (NoHighlight, "^o", "step") , may (isPaused && hasDebug) (if s ^. uiState . uiShowDebug then Alert else NoHighlight, "M-d", "debug") , Just (NoHighlight, "^zx", "speed") - , Just (NoHighlight, "^s", if s ^. uiState . uiShowREPL then "hide REPL" else "show REPL") + , Just (NoHighlight, "^,", if s ^. uiState . uiShowREPL then "hide REPL" else "show REPL") , Just (if s ^. uiState . uiShowRobots then NoHighlight else Alert, "M-h", "hide robots") ] may b = if b then Just else const Nothing From ba1f33b458d6c928074406048d79d7bc101db3e8 Mon Sep 17 00:00:00 2001 From: Noah Yorgey Date: Tue, 18 Jul 2023 20:17:30 -0400 Subject: [PATCH 2/3] Fix Command Line Weirdness Co-authored-by: Karl Ostmo --- src/Swarm/TUI/Controller.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Swarm/TUI/Controller.hs b/src/Swarm/TUI/Controller.hs index 5f4c73c29..8dfec1082 100644 --- a/src/Swarm/TUI/Controller.hs +++ b/src/Swarm/TUI/Controller.hs @@ -387,7 +387,7 @@ handleMainEvent ev = do -- Paint with the World Editor EC.handleCtrlLeftClick mouseLoc -- toggle collapse/expand REPL - ControlChar ',' -> do + MetaChar ',' -> do invalidateCacheEntry WorldCache uiState . uiShowREPL %= not MouseDown n _ _ mouseLoc -> From b76e4866774fdd48db95e54222dacc2dad97d0dc Mon Sep 17 00:00:00 2001 From: Noah Yorgey Date: Tue, 18 Jul 2023 20:18:17 -0400 Subject: [PATCH 3/3] Fix Command Line Weirdness Pt.2 Co-authored-by: Karl Ostmo --- src/Swarm/TUI/View.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Swarm/TUI/View.hs b/src/Swarm/TUI/View.hs index 6008ac7ed..88a695385 100644 --- a/src/Swarm/TUI/View.hs +++ b/src/Swarm/TUI/View.hs @@ -929,7 +929,7 @@ drawKeyMenu s = , may isPaused (NoHighlight, "^o", "step") , may (isPaused && hasDebug) (if s ^. uiState . uiShowDebug then Alert else NoHighlight, "M-d", "debug") , Just (NoHighlight, "^zx", "speed") - , Just (NoHighlight, "^,", if s ^. uiState . uiShowREPL then "hide REPL" else "show REPL") + , Just (NoHighlight, "M-,", if s ^. uiState . uiShowREPL then "hide REPL" else "show REPL") , Just (if s ^. uiState . uiShowRobots then NoHighlight else Alert, "M-h", "hide robots") ] may b = if b then Just else const Nothing