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

Switch focus when working directory or stage becomes empty

Browse source 
If the focus is on the working directory and it becomes empty (no files are listed) by either staging the last file or using the _Stage all_ command, the focus will be moved to the stage automatically. It works the same for when the stage becomes empty, by moving the focus to the working directory.

If the focus is on the diff area, the focus will not be moved when either the working directory or the stage becomes empty.

Fixes #215
This commit is contained in:
Jon Grythe Stødle 2020-07-27 20:55:17 +02:00 committed by Stephan Dilly
parent 8db6325777
commit 1c3295affc
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/tabs/status.rs
View file

@ -46,6 +46,7 @@ pub struct Status {
git_status_workdir: AsyncStatus,
git_status_stage: AsyncStatus,
queue: Queue,
git_action_executed: bool,
}
impl DrawableComponent for Status {
@ -130,6 +131,7 @@ impl Status {
git_diff: AsyncDiff::new(sender.clone()),
git_status_workdir: AsyncStatus::new(sender.clone()),
git_status_stage: AsyncStatus::new(sender.clone()),
git_action_executed: false,
}
}
@ -231,14 +233,29 @@ impl Status {
}
fn update_status(&mut self) -> Result<()> {
let status = self.git_status_stage.last()?;
self.index.set_items(&status.items)?;
let stage_status = self.git_status_stage.last()?;
self.index.set_items(&stage_status.items)?;
let status = self.git_status_workdir.last()?;
self.index_wd.set_items(&status.items)?;
let workdir_status = self.git_status_workdir.last()?;
self.index_wd.set_items(&workdir_status.items)?;
self.update_diff()?;
if self.git_action_executed {
self.git_action_executed = false;
if self.focus == Focus::WorkDir
&& workdir_status.items.is_empty()
&& !stage_status.items.is_empty()
{
self.switch_focus(Focus::Stage)?;
} else if self.focus == Focus::Stage
&& stage_status.items.is_empty()
{
self.switch_focus(Focus::WorkDir)?;
}
}
Ok(())
}
@ -371,6 +388,7 @@ impl Component for Status {
fn event(&mut self, ev: crossterm::event::Event) -> Result<bool> {
if self.visible {
if event_pump(ev, self.components_mut().as_mut_slice())? {
self.git_action_executed = true;
return Ok(true);
}