diff --git a/Cargo.toml b/Cargo.toml index 1ebfd542a..ed1468ba1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,7 @@ serde_json = "1.0.66" sobol_burley = "0.5.0" ndarray-stats = "0.5.1" linfa-linalg = "0.1.0" -ratatui = { version = "0.27.0", features = ["crossterm"] } -crossterm = "0.27.0" +ratatui = { version = "0.28.0", features = ["crossterm"] } tokio = { version = "1.32.0", features = ["sync", "rt"] } argmin = { version = "0.10.0", features = [] } argmin-math = { version = "0.4.0", features = ["ndarray_v0_15-nolinalg"] } diff --git a/src/tui/inputs/events.rs b/src/tui/inputs/events.rs index b832ea27e..afc3bc42d 100644 --- a/src/tui/inputs/events.rs +++ b/src/tui/inputs/events.rs @@ -22,8 +22,10 @@ impl Events { thread::spawn(move || { loop { // poll for tick rate duration, if no event, sent tick event. - if crossterm::event::poll(tick_rate).unwrap() { - if let crossterm::event::Event::Key(key) = crossterm::event::read().unwrap() { + if ratatui::crossterm::event::poll(tick_rate).unwrap() { + if let ratatui::crossterm::event::Event::Key(key) = + ratatui::crossterm::event::read().unwrap() + { let key = Key::from(key); event_tx.send(InputEvent::Input(key)).unwrap(); } diff --git a/src/tui/inputs/key.rs b/src/tui/inputs/key.rs index 17d8957b9..0c4e84715 100644 --- a/src/tui/inputs/key.rs +++ b/src/tui/inputs/key.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Display, Formatter}; -use crossterm::event; +use ratatui::crossterm::event; /// Represents an key. #[derive(PartialEq, Eq, Clone, Copy, Hash, Debug)] diff --git a/src/tui/ui.rs b/src/tui/ui.rs index a6bdb5448..88d8f443e 100644 --- a/src/tui/ui.rs +++ b/src/tui/ui.rs @@ -1,12 +1,15 @@ //! Defines the Terminal User Interface (TUI) for PMcore use anyhow::Result; -use crossterm::execute; use ratatui::{ backend::CrosstermBackend, layout::{Constraint, Direction, Layout}, Frame, Terminal, }; + +use ratatui::crossterm; +use ratatui::crossterm::execute; + use std::{ io::stdout, process::exit, @@ -34,8 +37,8 @@ use crate::tui::components::*; pub fn start_ui(mut rx: UnboundedReceiver, settings: Settings) -> Result<()> { initialize_panic_handler(); let mut stdout = stdout(); - execute!(stdout, crossterm::terminal::EnterAlternateScreen)?; - crossterm::terminal::enable_raw_mode()?; + execute!(stdout, ratatui::crossterm::terminal::EnterAlternateScreen)?; + ratatui::crossterm::terminal::enable_raw_mode()?; let backend = CrosstermBackend::new(stdout); let mut terminal = Terminal::new(backend)?; let mut app = App::new(); @@ -112,7 +115,7 @@ pub fn start_ui(mut rx: UnboundedReceiver, settings: Settings) -> Result<( // Exit alternate screen and disable raw mode execute!( terminal.backend_mut(), - crossterm::terminal::LeaveAlternateScreen + ratatui::crossterm::terminal::LeaveAlternateScreen )?; crossterm::terminal::disable_raw_mode()?; @@ -127,7 +130,7 @@ pub fn draw( settings: &Settings, log_history: &Vec, ) { - let size = rect.size(); + let size = rect.area(); // Vertical layout (overall) let chunks = Layout::default()