Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 08:58:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 56f732b7e1 into 8619c07f3f

Browse source
This commit is contained in:
吴杨帆 2026-05-17 16:50:23 +08:00 committed by GitHub
commit 0b50d78884
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/popups/compare_commits.rs
View file

@ -133,7 +133,12 @@ impl Component for CompareCommitsPopup {
self.diff.focus(true);
} else if key_match(e, self.key_config.keys.move_left)
{
self.hide_stacked(false);
if self.diff.focused() {
self.details.focus(true);
self.diff.focus(false);
} else {
self.hide_stacked(false);
}
}
return Ok(EventState::Consumed);

6
src/popups/file_revlog.rs
View file

@ -513,6 +513,12 @@ impl Component for FileRevlogPopup {
) && self.can_focus_diff()
{
self.diff.focus(true);
} else if key_match(
key,
self.key_config.keys.move_left,
) && 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);

7
src/popups/inspect_commit.rs
View file

@ -170,7 +170,12 @@ impl Component for InspectCommitPopup {
self.diff.focus(true);
} else if key_match(e, self.key_config.keys.move_left)
{
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.open_file_tree,

10
src/tabs/status.rs
View file

@ -845,6 +845,16 @@ impl Component for Status {
) && self.can_focus_diff()
{
self.switch_focus(Focus::Diff).map(Into::into)
} else if key_match(
k,
self.key_config.keys.move_left,
) && self.is_focus_on_diff()
{
self.switch_focus(match self.diff_target {
DiffTarget::Stage => Focus::Stage,
DiffTarget::WorkingDir => Focus::WorkDir,
})
.map(Into::into)
} else if key_match(
k,
self.key_config.keys.exit_popup,