Use Esc to close focused diff

Consume left arrow in `DiffComponent` even when `scrolled_right` is
already 0.

Author: cruessler

src/components/compare_commits.rs

@@ -121,7 +121,12 @@ impl Component for CompareCommitsComponent {
 
 			if let Event::Key(e) = ev {
 				if key_match(e, self.key_config.keys.exit_popup) {
-					self.hide_stacked(false);
+					if self.diff.focused() {
+						self.details.focus(true);
+						self.diff.focus(false);
+					} else {
+						self.hide_stacked(false);
+					}
 				} else if key_match(
 					e,
 					self.key_config.keys.focus_right,
@@ -132,13 +137,6 @@ impl Component for CompareCommitsComponent {
 				} else if key_match(
 					e,
 					self.key_config.keys.focus_left,
-				) && self.diff.focused()
-				{
-					self.details.focus(true);
-					self.diff.focus(false);
-				} else if key_match(
-					e,
-					self.key_config.keys.focus_left,
 				) {
 					self.hide_stacked(false);
 				}

src/components/diff.rs

@@ -811,9 +811,10 @@ impl Component for DiffComponent {
 					}
 					Ok(EventState::Consumed)
 				} else if key_match(e, self.key_config.keys.move_left)
-					&& self.scrolled_right > 0
 				{
-					self.scrolled_right -= 1;
+					if self.scrolled_right > 0 {
+						self.scrolled_right -= 1;
+					}
 					Ok(EventState::Consumed)
 				} else if key_match(
 					e,

src/components/file_revlog.rs

@@ -486,20 +486,17 @@ impl Component for FileRevlogComponent {
 
 			if let Event::Key(key) = event {
 				if key_match(key, self.key_config.keys.exit_popup) {
-					self.hide_stacked(false);
+					if self.diff.focused() {
+						self.diff.focus(false);
+					} else {
+						self.hide_stacked(false);
+					}
 				} else if key_match(
 					key,
 					self.key_config.keys.focus_right,
 				) && self.can_focus_diff()
 				{
 					self.diff.focus(true);
-				} else if key_match(
-					key,
-					self.key_config.keys.focus_left,
-				) {
-					if self.diff.focused() {
-						self.diff.focus(false);
-					}
 				} else if key_match(key, self.key_config.keys.enter) {
 					if let Some(commit_id) = self.selected_commit() {
 						self.hide_stacked(true);

src/components/inspect_commit.rs

@@ -126,7 +126,7 @@ impl Component for InspectCommitComponent {
 			));
 
 			out.push(CommandInfo::new(
-				strings::commands::diff_focus_left(&self.key_config),
+				strings::commands::close_popup(&self.key_config),
 				true,
 				self.diff.focused() || force_all,
 			));
@@ -157,7 +157,12 @@ impl Component for InspectCommitComponent {
 
 			if let Event::Key(e) = ev {
 				if key_match(e, self.key_config.keys.exit_popup) {
-					self.hide_stacked(false);
+					if self.diff.focused() {
+						self.details.focus(true);
+						self.diff.focus(false);
+					} else {
+						self.hide_stacked(false);
+					}
 				} else if key_match(
 					e,
 					self.key_config.keys.focus_right,
@@ -168,13 +173,6 @@ impl Component for InspectCommitComponent {
 				} else if key_match(
 					e,
 					self.key_config.keys.focus_left,
-				) && self.diff.focused()
-				{
-					self.details.focus(true);
-					self.diff.focus(false);
-				} else if key_match(
-					e,
-					self.key_config.keys.focus_left,
 				) {
 					self.hide_stacked(false);
 				}