michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-22 20:37:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: update search filter selected commit after Histories selected commit changed

Browse source
This commit is contained in:
Gadfly 2024-05-10 16:04:03 +08:00
parent 65ccc9fc7b
commit 592d087e05
4 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ViewModels/Histories.cs
View file

@ -369,6 +369,18 @@ namespace SourceGit.ViewModels
return menu;
}
public void NotifyAutoSelectedCommitChanged()
{
if (DetailContext is CommitDetail detail)
{
_repo.HandleSelectedCommitChanged(detail.Commit);
}
else
{
_repo.HandleSelectedCommitChanged(null);
}
}
private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
{
var submenu = new MenuItem();

15
src/ViewModels/Repository.cs
View file

@ -221,6 +221,12 @@ namespace SourceGit.ViewModels
private set => SetProperty(ref _hasUnsolvedConflicts, value);
}
public Models.Commit SearchResultSelectedCommit
{
get => _searchResultSelectedCommit;
set => SetProperty(ref _searchResultSelectedCommit, value);
}
public void Open()
{
_watcher = new Models.Watcher(this);
@ -1348,6 +1354,14 @@ namespace SourceGit.ViewModels
return menu;
}
public void HandleSelectedCommitChanged(Models.Commit commit)
{
if (SearchedCommits.Count > 0)
{
SearchResultSelectedCommit = commit;
}
}
private string _fullpath = string.Empty;
private string _gitDir = string.Empty;
private Models.GitFlow _gitflow = new Models.GitFlow();
@ -1377,5 +1391,6 @@ namespace SourceGit.ViewModels
private InProgressContext _inProgressContext = null;
private bool _hasUnsolvedConflicts = false;
private Models.Commit _searchResultSelectedCommit = null;
}
}

1
src/Views/Histories.axaml.cs
View file

@ -291,6 +291,7 @@ namespace SourceGit.Views
if (DataContext is ViewModels.Histories histories)
{
histories.Select(commitDataGrid.SelectedItems);
histories.NotifyAutoSelectedCommitChanged();
}
e.Handled = true;
}

1
src/Views/Repository.axaml
View file

@ -403,6 +403,7 @@
<DataGrid Grid.Row="1"
ItemsSource="{Binding SearchedCommits}"
SelectionMode="Single"
SelectedItem="{Binding SearchResultSelectedCommit, Mode=OneWay}"
CanUserReorderColumns="False"
CanUserResizeColumns="False"
CanUserSortColumns="False"