From dfac94b832c3727f862b2dff5514986a94c6bc00 Mon Sep 17 00:00:00 2001
From: Jaby <fenir50@web.de>
Date: Wed, 26 Jul 2023 22:16:09 +0200
Subject: [PATCH] Migrate to ratatui

---
 src/Tools/psxreadmap/Cargo.toml  |  2 +-
 src/Tools/psxreadmap/src/lib.rs  | 14 +++++++-------
 src/Tools/psxreadmap/src/main.rs |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Tools/psxreadmap/Cargo.toml b/src/Tools/psxreadmap/Cargo.toml
index de0875f9..e57d7caa 100644
--- a/src/Tools/psxreadmap/Cargo.toml
+++ b/src/Tools/psxreadmap/Cargo.toml
@@ -10,4 +10,4 @@ clap        = {version = "*", features = ["derive"]}
 crossterm   = "*"
 readmap     = {version = "*", path = "readmap"}
 tool_helper = {version = "*", path = "../tool_helper"}
-tui         = "*"
\ No newline at end of file
+ratatui     = "*"
\ No newline at end of file
diff --git a/src/Tools/psxreadmap/src/lib.rs b/src/Tools/psxreadmap/src/lib.rs
index aa108164..055517d5 100644
--- a/src/Tools/psxreadmap/src/lib.rs
+++ b/src/Tools/psxreadmap/src/lib.rs
@@ -3,16 +3,16 @@ use crossterm::event::KeyCode;
 use readmap::types::MemoryMap;
 use std::path::PathBuf;
 use tool_helper::Error;
-use tui::{
+use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
-    text::{Span, Spans},
+    text::{Line, Span},
     widgets::{Block, Borders, BorderType, Gauge, Paragraph, Tabs}
 };
 
 pub type EventReceiver = std::sync::mpsc::Receiver<Event<crossterm::event::KeyEvent>>;
-pub type Terminal      = tui::Terminal<tui::backend::CrosstermBackend<std::io::Stdout>>;
-type ConsoleFrame<'a>  = tui::Frame<'a, tui::backend::CrosstermBackend<std::io::Stdout>>;
+pub type Terminal      = ratatui::Terminal<ratatui::backend::CrosstermBackend<std::io::Stdout>>;
+type ConsoleFrame<'a>  = ratatui::Frame<'a, ratatui::backend::CrosstermBackend<std::io::Stdout>>;
 
 pub enum Event<I> {
     Input(I),
@@ -138,12 +138,12 @@ impl ConsoleUI {
                 Constraint::Length(3),
                 Constraint::Length(3),
                 Constraint::Min(3)
-            ]).split(new_frame);
+            ]).split(new_frame).to_vec();
 
             *stats_frames = Layout::default().direction(Direction::Vertical).constraints([
                 Constraint::Min(3),
                 Constraint::Length(3)
-            ]).split(sub_frames[2]);
+            ]).split(sub_frames[2]).to_vec();
 
             *frame = new_frame;
         }
@@ -165,7 +165,7 @@ impl ConsoleUI {
 
         let menu = MENU_TITLES.iter().map(|t| {
             let (first, rest) = t.split_at(1);
-            Spans::from(vec![
+            Line::from(vec![
                 Span::styled(first, Style::default().fg(Color::Yellow).add_modifier(Modifier::UNDERLINED),),
                 Span::styled(rest,  Style::default().fg(Color::White)),
             ])
diff --git a/src/Tools/psxreadmap/src/main.rs b/src/Tools/psxreadmap/src/main.rs
index e2667df5..519b1e8a 100644
--- a/src/Tools/psxreadmap/src/main.rs
+++ b/src/Tools/psxreadmap/src/main.rs
@@ -3,7 +3,7 @@ use crossterm::{event::{self, Event as CEvent, KeyboardEnhancementFlags, KeyEven
 use psxreadmap::{ConsoleUI, ConsoleUIData, Event, EventReceiver, Terminal, load_memory_map, UIState};
 use std::{io, path::PathBuf, sync::mpsc, thread, time::{Duration, Instant}};
 use tool_helper::{Error, exit_with_error};
-use tui::backend::CrosstermBackend;
+use ratatui::backend::CrosstermBackend;
 
 #[derive(Parser)]
 #[clap(about = "Opens and scans a MAP file to print extended information", long_about = None)]