fix: avoid crashes when the terminal is resized to unusually small si…

…zes.
Byron · Mar 10, 2024 · caa1e72 · caa1e72
2 parents 0c511ff + 24a6c29
commit caa1e72
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,9 +31,9 @@ chrono = { version = "0.4.31", default-features = false, features = ["std"] }
 # 'tui' related
 unicode-segmentation = { version = "1.3.0", optional = true }
 unicode-width = { version = "0.1.5", optional = true }
-crosstermion = { version = "0.13.0", default-features = false, optional = true }
-tui = { package = "ratatui", version = "0.25.0", optional = true, default-features = false }
-tui-react = { version = "0.22.0", optional = true }
+crosstermion = { version = "0.14.0", default-features = false, optional = true }
+tui = { package = "ratatui", version = "0.26.1", optional = true, default-features = false }
+tui-react = { version = "0.23.2", optional = true }
 open = { version = "5.0", optional = true }
 wild = "2.0.4"
 owo-colors = "4.0.0"
@@ -44,15 +44,15 @@ gix-path = "0.10.1"
 bstr = "1.8.0"
 simplelog = "0.12.1"
 log = "0.4.20"
-log-panics = { version = "2", features = ["with-backtrace"]}
+log-panics = { version = "2", features = ["with-backtrace"] }
 crossbeam = "0.8"
 
 [[bin]]
-name="dua"
-path="src/main.rs"
+name = "dua"
+path = "src/main.rs"
 
 [lib]
-name="dua"
+name = "dua"
 
 [profile.release]
 panic = 'abort'

diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs
@@ -17,7 +17,10 @@ use tui::{
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span, Text},
-    widgets::{Block, Borders, Paragraph, Widget},
+    widgets::{
+        Block, Borders, Paragraph, Scrollbar, ScrollbarOrientation, ScrollbarState, StatefulWidget,
+        Widget,
+    },
 };
 use tui_react::{
     draw_text_nowrap_fn,
@@ -292,7 +295,8 @@ impl MarkPane {
                     let num_path_graphemes = path.graphemes(true).count();
                     match num_path_graphemes + format.total_width() {
                         n if n > area.width as usize => {
-                            let desired_size = num_path_graphemes - (n - area.width as usize);
+                            let desired_size =
+                                num_path_graphemes.saturating_sub(n - area.width as usize);
                             fit_string_graphemes_with_ellipsis(
                                 path,
                                 num_path_graphemes,
@@ -355,8 +359,8 @@ impl MarkPane {
 
         let list_area = if self.has_focus {
             let (help_line_area, list_area) = {
-                let help_at_bottom =
-                    selected.unwrap_or(0) >= inner_area.height.saturating_sub(1) as usize / 2;
+                let help_at_bottom = selected.unwrap_or(0).saturating_sub(self.list.offset)
+                    >= inner_area.height.saturating_sub(1) as usize / 2;
                 let constraints = {
                     let mut c = vec![Constraint::Length(1), Constraint::Max(256)];
                     if help_at_bottom {
@@ -411,12 +415,33 @@ impl MarkPane {
             inner_area
         };
 
+        let line_count = marked.len();
         let props = ListProps {
             block: None,
             entry_in_view,
         };
         self.list.render(props, entries, list_area, buf);
 
+        let scrollbar = Scrollbar::default()
+            .orientation(ScrollbarOrientation::VerticalRight)
+            .begin_symbol(None)
+            .end_symbol(None);
+        let mut scrollbar_state =
+            ScrollbarState::new(line_count).position(selected.unwrap_or(self.list.offset));
+
+        scrollbar.render(
+            {
+                let mut scrollbar_area = list_area;
+                // The list has no blocks, so we need to increase
+                // the render area for scrollbar to make sure it
+                // will be drawn on the border.
+                scrollbar_area.width += 1;
+                scrollbar_area
+            },
+            buf,
+            &mut scrollbar_state,
+        );
+
         if has_focus {
             let help_text = " . = o|.. = u ── ⇊ = Ctrl+d|↓ = j|⇈ = Ctrl+u|↑ = k ";
             let help_text_block_width = block_width(help_text);