From 7d324c2843b0b1fba7de3ad3dc0eacd8a7ac2114 Mon Sep 17 00:00:00 2001
From: Tim Oram <dev@mitmaro.ca>
Date: Mon, 14 Aug 2023 09:00:45 -0230
Subject: Fix flicker caused by action width change

When the longest action name changed, it would cause the action column
in the list display to resize, causing a flicker. While this was
intended behavior, it almost always caused a redraw, which was jarring.
This changes the rendering of the action to keep the minimum draw width
of the action at 6, to reduce the amount of flicker.
---
 CHANGELOG.md                              |  4 +++-
 src/core/src/modules/list/tests/render.rs | 16 +++++++++++++++-
 src/core/src/modules/list/utils.rs        |  6 ++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ee4b6..d09fb7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## [Unreleased]
 ### Added
-- Post modified line exec command ([#888](https://github.com/MitMaro/git-interactive-rebase-tool/pull/888))
+- Post modified line exec command ([#888](https://github.com/MitMaro/git-interactive-rebase-tool/pull/890))
 
+### Fixed
+- Flicker when action width changes ([#888](https://github.com/MitMaro/git-interactive-rebase-tool/pull/891))
 
 ## [2.3.0] - 2023-07-19
 ### Added
diff --git a/src/core/src/modules/list/tests/render.rs b/src/core/src/modules/list/tests/render.rs
index f252bd9..165f098 100644
--- a/src/core/src/modules/list/tests/render.rs
+++ b/src/core/src/modules/list/tests/render.rs
@@ -125,7 +125,7 @@ fn noop_list() {
 			Style view_data,
 			"{TITLE}{HELP}",
 			"{BODY}",
-			"{Selected}{Normal} > noop {Pad( )}"
+			"{Selected}{Normal} > noop   {Pad( )}"
 		);
 	});
 }
@@ -171,3 +171,17 @@ fn pinned_segments() {
 		},
 	);
 }
+
+#[test]
+fn full_with_short_actions() {
+	module_test(&["pick aaaaaaaa comment 1"], &[], |mut test_context| {
+		let mut module = create_list(&Config::new(), test_context.take_todo_file());
+		let view_data = test_context.build_view_data(&mut module);
+		assert_rendered_output!(
+			Style view_data,
+			"{TITLE}{HELP}",
+			"{BODY}",
+			"{Selected}{Normal} > {ActionPick}pick   {Normal}aaaaaaaa comment 1{Pad( )}"
+		);
+	});
+}
diff --git a/src/core/src/modules/list/utils.rs b/src/core/src/modules/list/utils.rs
index 7e2b808..b0a3e88 100644
--- a/src/core/src/modules/list/utils.rs
+++ b/src/core/src/modules/list/utils.rs
@@ -268,12 +268,14 @@ pub(super) fn get_todo_line_segments(
 		false,
 	));
 
+	let action_padding = cmp::max(maximum_action_width, 6);
+
 	let action_name = if is_full_width {
 		if let Some(opt) = line.option() {
-			format!("{:maximum_action_width$} ", format!("{action} {opt}"))
+			format!("{:action_padding$} ", format!("{action} {opt}"))
 		}
 		else {
-			format!("{:maximum_action_width$} ", action.to_string())
+			format!("{:action_padding$} ", action.to_string())
 		}
 	}
 	else {
-- 
cgit v1.2.3