summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEllie Huxtable <ellie@elliehuxtable.com>2023-02-15 09:08:39 +0000
committerGitHub <noreply@github.com>2023-02-15 09:08:39 +0000
commit3fdd4f4591bc573906480c1c700df91ba866a2cb (patch)
tree2e1081120d34a653e72620089c1419db1239c55a
parentc5f96ad8b842a5ffe8f0536e7d7f4e91fda0e577 (diff)
Remove shortcut numbers (#708)
* Remove shortcut numbers I was also going to remove the offset so scrolling only happens at the top. But tbh, I quite like it this way. * Remove key binding
-rw-r--r--src/command/client/search/history_list.rs13
-rw-r--r--src/command/client/search/interactive.rs5
2 files changed, 5 insertions, 13 deletions
diff --git a/src/command/client/search/history_list.rs b/src/command/client/search/history_list.rs
index f4725b02..cf195a33 100644
--- a/src/command/client/search/history_list.rs
+++ b/src/command/client/search/history_list.rs
@@ -112,14 +112,11 @@ pub const PREFIX_LENGTH: u16 = " > 123ms 59s ago".len() as u16;
impl DrawState<'_> {
fn index(&mut self) {
- // these encode the slices of `" > "`, `" {n} "`, or `" "` in a compact form.
- // Yes, this is a hack, but it makes me feel happy
- static SLICES: &str = " > 1 2 3 4 5 6 7 8 9 ";
-
- let i = self.y as usize + self.state.offset;
- let i = i.checked_sub(self.state.selected);
- let i = i.unwrap_or(10).min(10) * 2;
- self.draw(&SLICES[i..i + 3], Style::default());
+ if self.y as usize + self.state.offset == self.state.selected {
+ self.draw(" >> ", Style::default());
+ } else {
+ self.draw(" ", Style::default());
+ }
}
fn duration(&mut self, h: &History) {
diff --git a/src/command/client/search/interactive.rs b/src/command/client/search/interactive.rs
index 903c3362..fb60b47b 100644
--- a/src/command/client/search/interactive.rs
+++ b/src/command/client/search/interactive.rs
@@ -95,7 +95,6 @@ impl State {
len: usize,
) -> Option<usize> {
let ctrl = input.modifiers.contains(KeyModifiers::CONTROL);
- let alt = input.modifiers.contains(KeyModifiers::ALT);
match input.code {
KeyCode::Char('c' | 'd' | 'g') if ctrl => return Some(RETURN_ORIGINAL),
KeyCode::Esc => {
@@ -107,10 +106,6 @@ impl State {
KeyCode::Enter => {
return Some(self.results_state.selected());
}
- KeyCode::Char(c @ '1'..='9') if alt => {
- let c = c.to_digit(10)? as usize;
- return Some(self.results_state.selected() + c);
- }
KeyCode::Left => {
self.input.left();
}