dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-21 04:04:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feature: auto focus the next change after stage/unstage selected changes (#464)

Browse source
This commit is contained in:
leo 2024-09-12 16:33:56 +08:00
parent dcddc5a2f2
commit ea3a6a4755
No known key found for this signature in database
4 changed files with 122 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/ViewModels/WorkingCopy.cs
View file

@ -325,23 +325,24 @@ namespace SourceGit.ViewModels
PopupHost.ShowPopup(new StashChanges(_repo, _cached, true));
}
public void StageSelected()
public void StageSelected(Models.Change next)
{
StageChanges(_selectedUnstaged);
SelectedUnstaged = [];
StageChanges(_selectedUnstaged, next);
}
public void StageAll()
{
StageChanges(_unstaged);
SelectedUnstaged = [];
StageChanges(_unstaged, null);
}
public async void StageChanges(List<Models.Change> changes)
public async void StageChanges(List<Models.Change> changes, Models.Change next)
{
if (_unstaged.Count == 0 || changes.Count == 0)
return;
// Use `_selectedUnstaged` instead of `SelectedUnstaged` to avoid UI refresh.
_selectedUnstaged = next != null ? [next] : [];
IsStaging = true;
_repo.SetWatcherEnabled(false);
if (changes.Count == _unstaged.Count)
@ -362,23 +363,24 @@ namespace SourceGit.ViewModels
IsStaging = false;
}
public void UnstageSelected()
public void UnstageSelected(Models.Change next)
{
UnstageChanges(_selectedStaged);
SelectedStaged = [];
UnstageChanges(_selectedStaged, next);
}
public void UnstageAll()
{
UnstageChanges(_staged);
SelectedStaged = [];
UnstageChanges(_staged, null);
}
public async void UnstageChanges(List<Models.Change> changes)
public async void UnstageChanges(List<Models.Change> changes, Models.Change next)
{
if (_staged.Count == 0 || changes.Count == 0)
return;
// Use `_selectedStaged` instead of `SelectedStaged` to avoid UI refresh.
_selectedStaged = next != null ? [next] : [];
IsUnstaging = true;
_repo.SetWatcherEnabled(false);
if (_useAmend)
@ -499,7 +501,7 @@ namespace SourceGit.ViewModels
stage.Icon = App.CreateMenuIcon("Icons.File.Add");
stage.Click += (_, e) =>
{
StageChanges(_selectedUnstaged);
StageChanges(_selectedUnstaged, null);
e.Handled = true;
};
@ -823,7 +825,7 @@ namespace SourceGit.ViewModels
stage.Icon = App.CreateMenuIcon("Icons.File.Add");
stage.Click += (_, e) =>
{
StageChanges(_selectedUnstaged);
StageChanges(_selectedUnstaged, null);
e.Handled = true;
};
@ -917,7 +919,7 @@ namespace SourceGit.ViewModels
unstage.Icon = App.CreateMenuIcon("Icons.File.Remove");
unstage.Click += (_, e) =>
{
UnstageChanges(_selectedStaged);
UnstageChanges(_selectedStaged, null);
e.Handled = true;
};
@ -1086,7 +1088,7 @@ namespace SourceGit.ViewModels
unstage.Icon = App.CreateMenuIcon("Icons.File.Remove");
unstage.Click += (_, e) =>
{
UnstageChanges(_selectedStaged);
UnstageChanges(_selectedStaged, null);
e.Handled = true;
};