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

Scroll larger amounts via ctrl+u/d/b/f

Browse source
This commit is contained in:
Joscha 2022-08-02 02:28:36 +02:00
parent 00bcdddc62
commit 402b79eb31
1 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,8 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
} }
} }
async fn handle_movement_key_event(&mut self, event: KeyEvent) -> bool { async fn handle_movement_key_event(&mut self, frame: &mut Frame, event: KeyEvent) -> bool {
let chat_height = frame.size().height - 3;
let shift_only = event.modifiers.difference(KeyModifiers::SHIFT).is_empty(); let shift_only = event.modifiers.difference(KeyModifiers::SHIFT).is_empty();
match event.code { match event.code {
@ -129,6 +130,22 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
KeyCode::Char('G') | KeyCode::End if shift_only => self.move_cursor_to_bottom().await, KeyCode::Char('G') | KeyCode::End if shift_only => self.move_cursor_to_bottom().await,
KeyCode::Char('y') if event.modifiers == KeyModifiers::CONTROL => self.scroll_up(1), KeyCode::Char('y') if event.modifiers == KeyModifiers::CONTROL => self.scroll_up(1),
KeyCode::Char('e') if event.modifiers == KeyModifiers::CONTROL => self.scroll_down(1), KeyCode::Char('e') if event.modifiers == KeyModifiers::CONTROL => self.scroll_down(1),
KeyCode::Char('u') if event.modifiers == KeyModifiers::CONTROL => {
let delta = chat_height / 2;
self.scroll_up(delta.into());
}
KeyCode::Char('d') if event.modifiers == KeyModifiers::CONTROL => {
let delta = chat_height / 2;
self.scroll_down(delta.into());
}
KeyCode::Char('b') if event.modifiers == KeyModifiers::CONTROL => {
let delta = chat_height.saturating_sub(1);
self.scroll_up(delta.into());
}
KeyCode::Char('f') if event.modifiers == KeyModifiers::CONTROL => {
let delta = chat_height.saturating_sub(1);
self.scroll_down(delta.into());
}
_ => return false, _ => return false,
} }
@ -176,11 +193,12 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
async fn handle_normal_key_event( async fn handle_normal_key_event(
&mut self, &mut self,
frame: &mut Frame,
event: KeyEvent, event: KeyEvent,
can_compose: bool, can_compose: bool,
id: Option<M::Id>, id: Option<M::Id>,
) -> bool { ) -> bool {
if self.handle_movement_key_event(event).await { if self.handle_movement_key_event(frame, event).await {
true true
} else if can_compose { } else if can_compose {
self.handle_edit_initiating_key_event(event, id).await self.handle_edit_initiating_key_event(event, id).await
@ -198,7 +216,10 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
) -> Reaction<M> { ) -> Reaction<M> {
match &self.cursor { match &self.cursor {
Cursor::Bottom => { Cursor::Bottom => {
if self.handle_normal_key_event(event, can_compose, None).await { if self
.handle_normal_key_event(terminal.frame(), event, can_compose, None)
.await
{
Reaction::Handled Reaction::Handled
} else { } else {
Reaction::NotHandled Reaction::NotHandled
@ -207,7 +228,7 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
Cursor::Msg(id) => { Cursor::Msg(id) => {
let id = id.clone(); let id = id.clone();
if self if self
.handle_normal_key_event(event, can_compose, Some(id)) .handle_normal_key_event(terminal.frame(), event, can_compose, Some(id))
.await .await
{ {
Reaction::Handled Reaction::Handled
@ -226,7 +247,10 @@ impl<M: Msg, S: MsgStore<M>> InnerTreeViewState<M, S> {
parent.clone(), parent.clone(),
), ),
Cursor::Pseudo { .. } => { Cursor::Pseudo { .. } => {
if self.handle_movement_key_event(event).await { if self
.handle_movement_key_event(terminal.frame(), event)
.await
{
Reaction::Handled Reaction::Handled
} else { } else {
Reaction::NotHandled Reaction::NotHandled