about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-06-04 20:00:49 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-06-04 20:07:10 -0700
commitcd4d0ae5b6a6ccb8a34644e47d39912a0fdf9886 (patch)
tree4e9ebe904864ebdc673dcbc98df27a25c2afad42
parent81b3f72fb8a0f822723945f5f7afd6c59d384110 (diff)
downloadmu-cd4d0ae5b6a6ccb8a34644e47d39912a0fdf9886.tar.gz
.
Keep hotkeys stable when different elements are in focus.
-rw-r--r--shell/sandbox.mu4
-rw-r--r--shell/trace.mu6
2 files changed, 5 insertions, 5 deletions
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index 51ce1442..ab024018 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -417,6 +417,8 @@ fn render-sandbox-edit-menu screen: (addr screen), _self: (addr sandbox) {
   set-cursor-position screen, 0/x, y
   draw-text-rightward-from-cursor screen, " ^r ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " run main  ", width, 7/fg, 0xc5/bg=blue-bg
+  draw-text-rightward-from-cursor screen, " ^s ", width, 0/fg, 0x5c/bg=black
+  draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0xc5/bg=blue-bg
   $render-sandbox-edit-menu:render-ctrl-m: {
     var self/eax: (addr sandbox) <- copy _self
     var has-trace?/eax: boolean <- has-trace? self
@@ -430,8 +432,6 @@ fn render-sandbox-edit-menu screen: (addr screen), _self: (addr sandbox) {
     draw-text-rightward-from-cursor screen, " ^m ", width, 0/fg, 3/bg=keyboard
     draw-text-rightward-from-cursor screen, " to keyboard  ", width, 7/fg, 0xc5/bg=blue-bg
   }
-  draw-text-rightward-from-cursor screen, " ^s ", width, 0/fg, 0x5c/bg=black
-  draw-text-rightward-from-cursor screen, " run sandbox  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " ^a ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " <<  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " ^b ", width, 0/fg, 0x5c/bg=black
diff --git a/shell/trace.mu b/shell/trace.mu
index 63ee3a53..8be76bb3 100644
--- a/shell/trace.mu
+++ b/shell/trace.mu
@@ -892,13 +892,13 @@ fn render-trace-menu screen: (addr screen) {
   height <- increment
   clear-rect screen, 0/x, y, width, height, 0xc5/bg=blue-bg
   set-cursor-position screen, 0/x, y
-  draw-text-rightward-from-cursor screen, " enter/bksp ", width, 0/fg, 0x5c/bg=black
-  draw-text-rightward-from-cursor screen, " expand/collapse  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " ^r ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " run main  ", width, 7/fg, 0xc5/bg=blue-bg
   draw-text-rightward-from-cursor screen, " ^m ", width, 0/fg, 3/bg=keyboard
   draw-text-rightward-from-cursor screen, " to keyboard  ", width, 7/fg, 0xc5/bg=blue-bg
-  draw-text-rightward-from-cursor screen, " ^s ", width, 0/fg, 3/bg=keyboard
+  draw-text-rightward-from-cursor screen, " enter/bksp ", width, 0/fg, 0x5c/bg=black
+  draw-text-rightward-from-cursor screen, " expand/collapse  ", width, 7/fg, 0xc5/bg=blue-bg
+  draw-text-rightward-from-cursor screen, " ^s ", width, 0/fg, 0x5c/bg=black
   draw-text-rightward-from-cursor screen, " show whole line  ", width, 7/fg, 0xc5/bg=blue-bg
 }