From b445b8cf69c362de7ad494a6911d21120c824bbc Mon Sep 17 00:00:00 2001
From: wcampbell <wcampbell1995@gmail.com>
Date: Mon, 2 Sep 2024 21:54:17 -0400
Subject: [PATCH] Update ratatui to 0.28.1

---
 Cargo.lock              | 73 +++++++++++++++++++++++++++++------------
 apps/Cargo.toml         |  2 +-
 apps/src/radar/radar.rs |  4 +--
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 75d207e..8e38541 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -315,13 +315,14 @@ checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "compact_str"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
+checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644"
 dependencies = [
  "castaway",
  "cfg-if",
  "itoa",
+ "rustversion",
  "ryu",
  "static_assertions",
 ]
@@ -411,8 +412,24 @@ dependencies = [
  "bitflags",
  "crossterm_winapi",
  "libc",
- "mio",
+ "mio 0.8.11",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
+dependencies = [
+ "bitflags",
+ "crossterm_winapi",
+ "mio 1.0.2",
  "parking_lot",
+ "rustix",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -710,6 +727,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "instability"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
+dependencies = [
+ "quote",
+ "syn 2.0.71",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.12"
@@ -845,6 +872,19 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1011,18 +1051,18 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "ratatui"
-version = "0.27.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16546c5b5962abf8ce6e2881e722b4e0ae3b6f1a08a26ae3573c55853ca68d3"
+checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
 dependencies = [
  "bitflags",
  "cassowary",
  "compact_str",
- "crossterm",
+ "crossterm 0.28.1",
+ "instability",
  "itertools 0.13.0",
  "lru",
  "paste",
- "stability",
  "strum",
  "strum_macros",
  "unicode-segmentation",
@@ -1110,7 +1150,7 @@ dependencies = [
  "adsb_deku",
  "anyhow",
  "clap",
- "crossterm",
+ "crossterm 0.27.0",
  "csv",
  "gpsd_proto",
  "hex",
@@ -1262,12 +1302,13 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
+ "mio 1.0.2",
  "signal-hook",
 ]
 
@@ -1286,16 +1327,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "stability"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac"
-dependencies = [
- "quote",
- "syn 2.0.71",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
diff --git a/apps/Cargo.toml b/apps/Cargo.toml
index 21b14c4..d694a64 100644
--- a/apps/Cargo.toml
+++ b/apps/Cargo.toml
@@ -19,7 +19,7 @@ rsadsb_common = { path = "../rsadsb_common" }
 hex = "0.4.0"
 crossterm = "0.27.0"
 clap = { version = "4.5.13", features = ["color", "derive", "wrap_help"] }
-ratatui = "0.27.0"
+ratatui = "0.28.1"
 gpsd_proto = "1.0.0"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
diff --git a/apps/src/radar/radar.rs b/apps/src/radar/radar.rs
index cf353ce..d5df782 100644
--- a/apps/src/radar/radar.rs
+++ b/apps/src/radar/radar.rs
@@ -492,7 +492,7 @@ fn init_tcp_reader(
             .direction(Direction::Vertical)
             .margin(1)
             .constraints([Constraint::Min(3), Constraint::Percentage(100)].as_ref())
-            .split(f.size());
+            .split(f.area());
 
         let paragraph = Paragraph::new(format!("radar: Waiting for connection to {ip}:{port}"))
             .alignment(Alignment::Left);
@@ -712,7 +712,7 @@ fn draw(
                 .direction(Direction::Vertical)
                 .margin(1)
                 .constraints([Constraint::Min(3), Constraint::Percentage(100)].as_ref())
-                .split(f.size());
+                .split(f.area());
 
             // render tabs
             let airplane_len = format!("Airplanes({})", adsb_airplanes.len());