chore: dependencies updated

Replace depreciated ratatui methods
This commit is contained in:
Jack Wills
2024-08-15 15:18:29 +00:00
parent d57a91982a
commit d6238587ff
4 changed files with 90 additions and 128 deletions
+4 -4
View File
@@ -834,7 +834,7 @@ pub fn help_box(f: &mut Frame) {
let area = popup(
max_height,
max_line_width,
f.size(),
f.area(),
BoxLocation::MiddleCentre,
);
@@ -931,7 +931,7 @@ pub fn delete_confirm(f: &mut Frame, gui_state: &Arc<Mutex<GuiState>>, name: &Co
let area = popup(
lines,
max_line_width.into(),
f.size(),
f.area(),
BoxLocation::MiddleCentre,
);
@@ -1000,7 +1000,7 @@ pub fn error(f: &mut Frame, error: AppError, seconds: Option<u8>) {
.block(block)
.alignment(Alignment::Center);
let area = popup(lines, max_line_width, f.size(), BoxLocation::MiddleCentre);
let area = popup(lines, max_line_width, f.area(), BoxLocation::MiddleCentre);
// let (paragraph, area) = gen_error(f, error, seconds);
f.render_widget(Clear, area);
@@ -1027,7 +1027,7 @@ pub fn info(f: &mut Frame, text: &str, instant: Instant, gui_state: &Arc<Mutex<G
.block(block)
.alignment(Alignment::Center);
let area = popup(lines, max_line_width, f.size(), BoxLocation::BottomRight);
let area = popup(lines, max_line_width, f.area(), BoxLocation::BottomRight);
f.render_widget(Clear, area);
f.render_widget(paragraph, area);
if instant.elapsed().as_millis() > 4000 {
+5 -5
View File
@@ -7,7 +7,7 @@ use crossterm::{
use parking_lot::{Mutex, MutexGuard};
use ratatui::{
backend::CrosstermBackend,
layout::{Constraint, Direction, Layout},
layout::{Constraint, Direction, Layout, Position},
Frame, Terminal,
};
use std::{
@@ -42,7 +42,7 @@ pub struct Ui {
is_running: Arc<AtomicBool>,
now: Instant,
terminal: Terminal<CrosstermBackend<Stdout>>,
cursor_position: (u16, u16),
cursor_position: Position,
}
impl Ui {
@@ -66,7 +66,7 @@ impl Ui {
is_running: Arc<AtomicBool>,
) {
if let Ok(mut terminal) = Self::setup_terminal() {
let cursor_position = terminal.get_cursor().unwrap_or_default();
let cursor_position = terminal.get_cursor_position().unwrap_or_default();
let mut ui = Self {
app_data,
cursor_position,
@@ -115,7 +115,7 @@ impl Ui {
disable_raw_mode()?;
self.terminal.clear().ok();
self.terminal
.set_cursor(self.cursor_position.0, self.cursor_position.1)?;
.set_cursor_position(self.cursor_position)?;
Ok(self.terminal.show_cursor()?)
}
@@ -276,7 +276,7 @@ fn draw_frame(f: &mut Frame, app_data: &Arc<Mutex<AppData>>, gui_state: &Arc<Mut
let whole_layout = Layout::default()
.direction(Direction::Vertical)
.constraints(whole_constraints)
.split(f.size());
.split(f.area());
// Split into 3, containers+controls, logs, then graphs
let upper_main = Layout::default()