From 6c3e3bb5195420ea3b46037ed24f4eded7817476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Fri, 4 Apr 2025 15:01:32 +0200 Subject: [PATCH] feat(multiverse): Tweak the keybindings for the details view a bit --- labs/multiverse/src/widgets/help.rs | 4 +++- .../src/widgets/room_view/details/mod.rs | 3 +-- labs/multiverse/src/widgets/room_view/mod.rs | 18 ++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/labs/multiverse/src/widgets/help.rs b/labs/multiverse/src/widgets/help.rs index 89bd838b3..f0e376d13 100644 --- a/labs/multiverse/src/widgets/help.rs +++ b/labs/multiverse/src/widgets/help.rs @@ -24,7 +24,9 @@ impl Widget for &mut HelpView { let rows = vec![ Row::new(vec![Cell::from("F1"), Cell::from("Open Help")]), Row::new(vec![Cell::from("F10"), Cell::from("Open the encryption settings")]), - Row::new(vec![Cell::from("F8"), Cell::from("Open the details view of a room")]), + Row::new(vec![Cell::from("ALT-l"), Cell::from("Open the linked chunk details view")]), + Row::new(vec![Cell::from("ALT-e"), Cell::from("Open the events details view")]), + Row::new(vec![Cell::from("ALT-r"), Cell::from("Open the read receipt details view")]), Row::new(vec![Cell::from("Ctrl-q"), Cell::from("Quit Multiverse")]), Row::new(vec![ Cell::from("Ctrl-j / Ctrl-down"), diff --git a/labs/multiverse/src/widgets/room_view/details/mod.rs b/labs/multiverse/src/widgets/room_view/details/mod.rs index 4b2ee9b80..d88dec4cb 100644 --- a/labs/multiverse/src/widgets/room_view/details/mod.rs +++ b/labs/multiverse/src/widgets/room_view/details/mod.rs @@ -63,8 +63,7 @@ impl SelectedTab { /// Return tab's name as a styled `Line` fn title(self) -> Line<'static> { - let index = self as usize + 1; - format!(" {index}. {self} ").fg(tailwind::SLATE.c200).bg(self.palette().c900).into() + format!(" {self} ").fg(tailwind::SLATE.c200).bg(self.palette().c900).into() } const fn palette(&self) -> tailwind::Palette { diff --git a/labs/multiverse/src/widgets/room_view/mod.rs b/labs/multiverse/src/widgets/room_view/mod.rs index 91a7e1f3a..a12b86cf7 100644 --- a/labs/multiverse/src/widgets/room_view/mod.rs +++ b/labs/multiverse/src/widgets/room_view/mod.rs @@ -87,25 +87,19 @@ impl RoomView { (KeyModifiers::NONE, PageUp) => self.back_paginate(), - (KeyModifiers::NONE, F(8)) => { + (KeyModifiers::ALT, Char('e')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_events_as_selected() } } } - (KeyModifiers::ALT, Char('1')) => { - if self.selected_room.is_some() { - self.mode = Mode::Details { view: RoomDetails::with_events_as_selected() } - } - } - - (KeyModifiers::ALT, Char('2')) => { + (KeyModifiers::ALT, Char('r')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_receipts_as_selected() } } } - (KeyModifiers::ALT, Char('3')) => { + (KeyModifiers::ALT, Char('l')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_chunks_as_selected() } } @@ -117,19 +111,19 @@ impl RoomView { Mode::Details { view } => match (key.modifiers, key.code) { (KeyModifiers::NONE, PageUp) => self.back_paginate(), - (KeyModifiers::ALT, Char('1')) => { + (KeyModifiers::ALT, Char('e')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_events_as_selected() } } } - (KeyModifiers::ALT, Char('2')) => { + (KeyModifiers::ALT, Char('r')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_receipts_as_selected() } } } - (KeyModifiers::ALT, Char('3')) => { + (KeyModifiers::ALT, Char('l')) => { if self.selected_room.is_some() { self.mode = Mode::Details { view: RoomDetails::with_chunks_as_selected() } }