Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorganize key bindings list a bit

Browse source
This commit is contained in:
Joscha 2022-09-25 22:50:45 +02:00
parent 5d1252faae
commit bbf6371f87
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ui/chat/tree.rs
View file

@ -160,9 +160,7 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
} }
pub fn list_edit_initiating_key_bindings(&self, bindings: &mut KeyBindingsList) { pub fn list_edit_initiating_key_bindings(&self, bindings: &mut KeyBindingsList) {
bindings.empty(); bindings.binding("r", "reply to message (inline if possible, else directly)");
bindings.binding("r", "reply to message");
bindings.binding_ctd("(inline if possible, otherwise directly)");
bindings.binding("R", "reply to message (opposite of R)"); bindings.binding("R", "reply to message (opposite of R)");
bindings.binding("t", "start a new thread"); bindings.binding("t", "start a new thread");
} }
@ -197,8 +195,10 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
pub fn list_normal_key_bindings(&self, bindings: &mut KeyBindingsList, can_compose: bool) { pub fn list_normal_key_bindings(&self, bindings: &mut KeyBindingsList, can_compose: bool) {
self.list_movement_key_bindings(bindings); self.list_movement_key_bindings(bindings);
bindings.empty();
self.list_action_key_bindings(bindings); self.list_action_key_bindings(bindings);
if can_compose { if can_compose {
bindings.empty();
self.list_edit_initiating_key_bindings(bindings); self.list_edit_initiating_key_bindings(bindings);
} }
} }

3
src/ui/euph/room.rs
View file

@ -497,7 +497,6 @@ impl EuphRoom {
pub async fn list_normal_key_bindings(&self, bindings: &mut KeyBindingsList) { pub async fn list_normal_key_bindings(&self, bindings: &mut KeyBindingsList) {
// Handled in rooms list, not here // Handled in rooms list, not here
// TODO Move to rooms list?
bindings.binding("esc", "leave room"); bindings.binding("esc", "leave room");
let status = self.status().await; let status = self.status().await;
@ -512,6 +511,8 @@ impl EuphRoom {
} }
Focus::NickList => { Focus::NickList => {
bindings.binding("tab", "focus on chat"); bindings.binding("tab", "focus on chat");
bindings.empty();
bindings.heading("Nick list");
self.list_nick_list_focus_key_bindings(bindings); self.list_nick_list_focus_key_bindings(bindings);
} }
} }