diff --git a/src/ui.rs b/src/ui.rs index 5f6839f..c4b11f2 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -14,13 +14,13 @@ use parking_lot::FairMutex; use tokio::sync::mpsc::error::TryRecvError; use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender}; use tokio::task; -use toss::frame::{Frame, Pos, Size}; +use toss::frame::Frame; use toss::terminal::Terminal; use crate::logger::{LogMsg, Logger}; use crate::vault::Vault; -use self::chat::{Chat, ChatState}; +use self::chat::ChatState; use self::rooms::Rooms; use self::widgets::Widget; @@ -141,11 +141,10 @@ impl Ui { }; terminal.autoresize()?; loop { - let size = terminal.frame().size(); let result = match event { UiEvent::Redraw => EventHandleResult::Continue, UiEvent::Term(Event::Key(event)) => { - self.handle_key_event(event, terminal, size, &crossterm_lock) + self.handle_key_event(event, terminal, &crossterm_lock) .await } UiEvent::Term(Event::Mouse(event)) => self.handle_mouse_event(event).await?, @@ -176,7 +175,6 @@ impl Ui { &mut self, event: KeyEvent, terminal: &mut Terminal, - size: Size, crossterm_lock: &Arc>, ) -> EventHandleResult { // Always exit when shift+q or ctrl+c are pressed @@ -196,7 +194,7 @@ impl Ui { match self.mode { Mode::Main => { self.rooms - .handle_key_event(terminal, size, crossterm_lock, event) + .handle_key_event(terminal, crossterm_lock, event) .await } Mode::Log => { diff --git a/src/ui/room.rs b/src/ui/room.rs index bc8f7ac..c789e93 100644 --- a/src/ui/room.rs +++ b/src/ui/room.rs @@ -291,7 +291,6 @@ impl EuphRoom { pub async fn handle_key_event( &mut self, terminal: &mut Terminal, - size: Size, crossterm_lock: &Arc>, event: KeyEvent, ) { diff --git a/src/ui/rooms.rs b/src/ui/rooms.rs index 9a4f8c3..64574f7 100644 --- a/src/ui/rooms.rs +++ b/src/ui/rooms.rs @@ -6,7 +6,7 @@ use crossterm::event::{KeyCode, KeyEvent}; use crossterm::style::{ContentStyle, Stylize}; use parking_lot::FairMutex; use tokio::sync::mpsc; -use toss::frame::{Frame, Size}; +use toss::frame::Frame; use toss::styled::Styled; use toss::terminal::Terminal; @@ -158,7 +158,6 @@ impl Rooms { pub async fn handle_key_event( &mut self, terminal: &mut Terminal, - size: Size, crossterm_lock: &Arc>, event: KeyEvent, ) { @@ -170,7 +169,7 @@ impl Rooms { EuphRoom::new(self.vault.euph(room.clone()), self.ui_event_tx.clone()) }); actual_room - .handle_key_event(terminal, size, crossterm_lock, event) + .handle_key_event(terminal, crossterm_lock, event) .await; } } else {