From 437a15f3d680d78c2c2889bddb7a7270a7a12d06 Mon Sep 17 00:00:00 2001 From: David Peter Date: Wed, 7 Dec 2022 21:35:34 +0100 Subject: [PATCH] One panel by default is terminal is not wide enough closes #182 --- src/bin/hexyl.rs | 5 ++++- tests/integration_tests.rs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/hexyl.rs b/src/bin/hexyl.rs index 42d4768..5855b3c 100644 --- a/src/bin/hexyl.rs +++ b/src/bin/hexyl.rs @@ -417,7 +417,10 @@ fn run() -> Result<()> { { max_panels_fn(terminal_width, base_digits, group_bytes.into()) } else { - 2 + std::cmp::min( + 2, + max_panels_fn(terminal_width, base_digits, group_bytes.into()), + ) }; let stdout = io::stdout(); diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index d07831e..028f67b 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -565,7 +565,8 @@ mod base { .assert() .success() .pretty_stdout( - " 00110000 00110001 00110010 00110011 00110100 00110101 00110110 00110111 00111000 00111001 01100001 01100010 01100011 01100100 01100101 00001010 \n" + " 00110000 00110001 00110010 00110011 00110100 00110101 00110110 00110111 \n \ + 00111000 00111001 01100001 01100010 01100011 01100100 01100101 00001010 \n", ); } }