From fd8c441af3739027b7959a21b530ddb4da455f73 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Wed, 22 Jul 2020 11:04:22 +0800
Subject: Switch to crosstermion 0.3 for tui 0.10 support

---
 Cargo.lock                      | 44 +++++++++--------------------------------
 Cargo.toml                      |  2 +-
 src/interactive/widgets/help.rs |  3 ++-
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93f9aa0..be488dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -199,14 +199,14 @@ dependencies = [
 
 [[package]]
 name = "crosstermion"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "032534543c938ffc4106ee75411f4b7be2e0260e044d17dae36f9409ada87895"
+checksum = "5da9c0d4d1875d2553f0388e43c48a7323da8c879a4586178609cb6daea823e6"
 dependencies = [
  "crossterm",
  "termion",
- "tui 0.9.5",
- "tui-react 0.4.1",
+ "tui",
+ "tui-react 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -242,7 +242,7 @@ dependencies = [
  "petgraph",
  "pretty_assertions",
  "structopt",
- "tui 0.10.0",
+ "tui",
  "tui-react 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-segmentation",
  "wild",
@@ -691,22 +691,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "tui"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9533d39bef0ae8f510e8a99d78702e68d1bbf0b98a78ec9740509d287010ae1e"
-dependencies = [
- "bitflags",
- "cassowary",
- "crossterm",
- "either",
- "itertools",
- "termion",
- "unicode-segmentation",
- "unicode-width",
-]
-
 [[package]]
 name = "tui"
 version = "0.10.0"
@@ -715,18 +699,8 @@ checksum = "a977b0bb2e2033a6fef950f218f13622c3c34e59754b704ce3492dedab1dfe95"
 dependencies = [
  "bitflags",
  "cassowary",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "tui-react"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a0de793b78a2275af97d92666d52e00b7938518d1668c6f9a09eca2d4a69df"
-dependencies = [
- "log",
- "tui 0.9.5",
+ "crossterm",
+ "termion",
  "unicode-segmentation",
  "unicode-width",
 ]
@@ -736,7 +710,7 @@ name = "tui-react"
 version = "0.10.0"
 dependencies = [
  "log",
- "tui 0.10.0",
+ "tui",
  "unicode-segmentation",
  "unicode-width",
 ]
@@ -748,7 +722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bbc5221de660fa2cc79a5386d72f268174a90e37eef004f5210cc7f94baf78"
 dependencies = [
  "log",
- "tui 0.10.0",
+ "tui",
  "unicode-segmentation",
  "unicode-width",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index d5b5d3d..f1a3b7e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ colored = "2.0.0"
 
 # 'tui' related
 unicode-segmentation = { version = "1.3.0", optional = true }
-crosstermion = { optional = true, version = "0.2.0", default-features = false }
+crosstermion = { optional = true, version = "0.3.0", default-features = false }
 tui = { version = "0.10.0", optional = true, default-features = false }
 tui-react = { version = "0.10", optional = true }
 open = { version = "1.2.2", optional = true }
diff --git a/src/interactive/widgets/help.rs b/src/interactive/widgets/help.rs
index d0572df..a26bc70 100644
--- a/src/interactive/widgets/help.rs
+++ b/src/interactive/widgets/help.rs
@@ -192,6 +192,7 @@ impl HelpPane {
             .title(title)
             .border_style(*border_style)
             .borders(Borders::ALL);
+        let inner_block_area = block.inner(area);
         block.render(area, buf);
 
         if *has_focus {
@@ -211,7 +212,7 @@ impl HelpPane {
             }
         }
 
-        let area = margin(block.inner(area), 1);
+        let area = margin(inner_block_area, 1);
         self.scroll = self.scroll.min(num_lines.saturating_sub(area.height));
         Paragraph::new(Text::from(Spans::from(texts)))
             .scroll((self.scroll, 0))
-- 
cgit v1.2.3