Update tui to 0.8

6 files changed, 23 insertions, 29 deletions

diff --git a/Cargo.lock b/Cargo.lock
index d9bd4a8..c7ae4d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -200,7 +200,7 @@ dependencies = [
  "pretty_assertions",
  "structopt",
  "termion",
- "tui 0.7.0",
+ "tui",
  "tui-react",
  "unicode-segmentation",
 ]
@@ -597,25 +597,9 @@ dependencies = [
 
 [[package]]
 name = "tui"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee"
-dependencies = [
- "bitflags",
- "cassowary",
- "either",
- "itertools",
- "log",
- "termion",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "tui"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0606ff286997171664d4f5ace6b130dd6ba1b867e6a27433077f618807aedc3b"
+checksum = "6b871b61f4c4b81e630215cd12e0ec29953d4545898e21a9e023b7520a74a9f9"
 dependencies = [
  "bitflags",
  "cassowary",
@@ -632,7 +616,7 @@ name = "tui-react"
 version = "0.1.2"
 dependencies = [
  "log",
- "tui 0.6.2",
+ "tui",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 8479cfc..976cde9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ jwalk = "0.4.0"
 byte-unit = "3"
 termion = "1.5.2"
 atty = "0.2.11"
-tui = "0.6.0"
+tui = "0.8.0"
 petgraph = "0.5"
 itertools = "0.8.0"
 open = "1.2.2"
diff --git a/src/interactive/widgets/help.rs b/src/interactive/widgets/help.rs
index 88966be..f758386 100644
--- a/src/interactive/widgets/help.rs
+++ b/src/interactive/widgets/help.rs
@@ -1,8 +1,9 @@
 use crate::interactive::CursorDirection;
-use std::borrow::Borrow;
-use std::cell::{Cell, RefCell};
-use termion::event::Key;
-use termion::event::Key::*;
+use std::{
+    borrow::Borrow,
+    cell::{Cell, RefCell},
+};
+use termion::{event::Key, event::Key::*};
 use tui::{
     buffer::Buffer,
     layout::Rect,
@@ -20,6 +21,15 @@ pub struct HelpPaneProps {
     pub border_style: Style,
 }
 
+fn margin(r: Rect, margin: u16) -> Rect {
+    Rect {
+        x: r.x + margin,
+        y: r.y + margin,
+        width: r.width - 2 * margin,
+        height: r.height - 2 * margin,
+    }
+}
+
 impl HelpPane {
     pub fn key(&mut self, key: Key) {
         match key {
@@ -172,7 +182,7 @@ impl HelpPane {
             .borders(Borders::ALL);
         block.draw(area, buf);
 
-        let area = block.inner(area).inner(1);
+        let area = margin(block.inner(area), 1);
         self.scroll = self.scroll.min(num_lines.saturating_sub(area.height));
         Paragraph::new(texts.iter())
             .scroll(self.scroll)
diff --git a/src/interactive/widgets/main.rs b/src/interactive/widgets/main.rs
index 51dfaf8..8a43a01 100644
--- a/src/interactive/widgets/main.rs
+++ b/src/interactive/widgets/main.rs
@@ -7,11 +7,11 @@ use crate::interactive::{
 };
 use dua::traverse::Traversal;
 use std::borrow::Borrow;
-use tui::style::{Color, Style};
 use tui::{
     buffer::Buffer,
     layout::{Constraint, Direction, Layout, Rect},
     style::Modifier,
+    style::{Color, Style},
 };
 use Constraint::*;
 use FocussedPane::*;
diff --git a/tests/utilities.sh b/tests/utilities.sh
index 86084cf..7eb6d90 100644
--- a/tests/utilities.sh
+++ b/tests/utilities.sh
@@ -157,4 +157,4 @@ function expect_run () {
     exit 1
   fi
   set -e
-}
+}
\ No newline at end of file
diff --git a/tui-react/Cargo.toml b/tui-react/Cargo.toml
index 08c6ba6..ff58dc1 100644
--- a/tui-react/Cargo.toml
+++ b/tui-react/Cargo.toml
@@ -9,5 +9,5 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
-tui = "0.6.0"
+tui = "0.8.0"
 log = "0.4.6"