Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
Removed crossterm, as it is provided by ratatui
  • Loading branch information
mhovd committed Aug 11, 2024
1 parent d3f66ea commit 4e44b4e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
6 changes: 4 additions & 2 deletions src/tui/inputs/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/tui/inputs/key.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand Down
13 changes: 8 additions & 5 deletions src/tui/ui.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -34,8 +37,8 @@ use crate::tui::components::*;
pub fn start_ui(mut rx: UnboundedReceiver<Comm>, 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();
Expand Down Expand Up @@ -112,7 +115,7 @@ pub fn start_ui(mut rx: UnboundedReceiver<Comm>, 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()?;

Expand All @@ -127,7 +130,7 @@ pub fn draw(
settings: &Settings,
log_history: &Vec<String>,
) {
let size = rect.size();
let size = rect.area();

// Vertical layout (overall)
let chunks = Layout::default()
Expand Down

0 comments on commit 4e44b4e

Please sign in to comment.