Remove unused parameter
This commit is contained in:
parent
34e7af684b
commit
98f51a5a2e
3 changed files with 6 additions and 10 deletions
10
src/ui.rs
10
src/ui.rs
|
|
@ -14,13 +14,13 @@ use parking_lot::FairMutex;
|
||||||
use tokio::sync::mpsc::error::TryRecvError;
|
use tokio::sync::mpsc::error::TryRecvError;
|
||||||
use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
|
use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
|
||||||
use tokio::task;
|
use tokio::task;
|
||||||
use toss::frame::{Frame, Pos, Size};
|
use toss::frame::Frame;
|
||||||
use toss::terminal::Terminal;
|
use toss::terminal::Terminal;
|
||||||
|
|
||||||
use crate::logger::{LogMsg, Logger};
|
use crate::logger::{LogMsg, Logger};
|
||||||
use crate::vault::Vault;
|
use crate::vault::Vault;
|
||||||
|
|
||||||
use self::chat::{Chat, ChatState};
|
use self::chat::ChatState;
|
||||||
use self::rooms::Rooms;
|
use self::rooms::Rooms;
|
||||||
use self::widgets::Widget;
|
use self::widgets::Widget;
|
||||||
|
|
||||||
|
|
@ -141,11 +141,10 @@ impl Ui {
|
||||||
};
|
};
|
||||||
terminal.autoresize()?;
|
terminal.autoresize()?;
|
||||||
loop {
|
loop {
|
||||||
let size = terminal.frame().size();
|
|
||||||
let result = match event {
|
let result = match event {
|
||||||
UiEvent::Redraw => EventHandleResult::Continue,
|
UiEvent::Redraw => EventHandleResult::Continue,
|
||||||
UiEvent::Term(Event::Key(event)) => {
|
UiEvent::Term(Event::Key(event)) => {
|
||||||
self.handle_key_event(event, terminal, size, &crossterm_lock)
|
self.handle_key_event(event, terminal, &crossterm_lock)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
UiEvent::Term(Event::Mouse(event)) => self.handle_mouse_event(event).await?,
|
UiEvent::Term(Event::Mouse(event)) => self.handle_mouse_event(event).await?,
|
||||||
|
|
@ -176,7 +175,6 @@ impl Ui {
|
||||||
&mut self,
|
&mut self,
|
||||||
event: KeyEvent,
|
event: KeyEvent,
|
||||||
terminal: &mut Terminal,
|
terminal: &mut Terminal,
|
||||||
size: Size,
|
|
||||||
crossterm_lock: &Arc<FairMutex<()>>,
|
crossterm_lock: &Arc<FairMutex<()>>,
|
||||||
) -> EventHandleResult {
|
) -> EventHandleResult {
|
||||||
// Always exit when shift+q or ctrl+c are pressed
|
// Always exit when shift+q or ctrl+c are pressed
|
||||||
|
|
@ -196,7 +194,7 @@ impl Ui {
|
||||||
match self.mode {
|
match self.mode {
|
||||||
Mode::Main => {
|
Mode::Main => {
|
||||||
self.rooms
|
self.rooms
|
||||||
.handle_key_event(terminal, size, crossterm_lock, event)
|
.handle_key_event(terminal, crossterm_lock, event)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
Mode::Log => {
|
Mode::Log => {
|
||||||
|
|
|
||||||
|
|
@ -291,7 +291,6 @@ impl EuphRoom {
|
||||||
pub async fn handle_key_event(
|
pub async fn handle_key_event(
|
||||||
&mut self,
|
&mut self,
|
||||||
terminal: &mut Terminal,
|
terminal: &mut Terminal,
|
||||||
size: Size,
|
|
||||||
crossterm_lock: &Arc<FairMutex<()>>,
|
crossterm_lock: &Arc<FairMutex<()>>,
|
||||||
event: KeyEvent,
|
event: KeyEvent,
|
||||||
) {
|
) {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ use crossterm::event::{KeyCode, KeyEvent};
|
||||||
use crossterm::style::{ContentStyle, Stylize};
|
use crossterm::style::{ContentStyle, Stylize};
|
||||||
use parking_lot::FairMutex;
|
use parking_lot::FairMutex;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use toss::frame::{Frame, Size};
|
use toss::frame::Frame;
|
||||||
use toss::styled::Styled;
|
use toss::styled::Styled;
|
||||||
use toss::terminal::Terminal;
|
use toss::terminal::Terminal;
|
||||||
|
|
||||||
|
|
@ -158,7 +158,6 @@ impl Rooms {
|
||||||
pub async fn handle_key_event(
|
pub async fn handle_key_event(
|
||||||
&mut self,
|
&mut self,
|
||||||
terminal: &mut Terminal,
|
terminal: &mut Terminal,
|
||||||
size: Size,
|
|
||||||
crossterm_lock: &Arc<FairMutex<()>>,
|
crossterm_lock: &Arc<FairMutex<()>>,
|
||||||
event: KeyEvent,
|
event: KeyEvent,
|
||||||
) {
|
) {
|
||||||
|
|
@ -170,7 +169,7 @@ impl Rooms {
|
||||||
EuphRoom::new(self.vault.euph(room.clone()), self.ui_event_tx.clone())
|
EuphRoom::new(self.vault.euph(room.clone()), self.ui_event_tx.clone())
|
||||||
});
|
});
|
||||||
actual_room
|
actual_room
|
||||||
.handle_key_event(terminal, size, crossterm_lock, event)
|
.handle_key_event(terminal, crossterm_lock, event)
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue