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

fix<RevisionFiles>: fix revision file tree missing issue due to Unloaded event will be called on active tab changed

Browse source
This commit is contained in:
leo 2021-06-07 20:09:59 +08:00
parent 8db90574bb
commit dcf24db75a
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Views/Widgets/CommitChanges.xaml.cs
View file

@ -13,7 +13,7 @@ namespace SourceGit.Views.Widgets {
/// </summary> /// </summary>
public partial class CommitChanges : UserControl { public partial class CommitChanges : UserControl {
private string repo = null; private string repo = null;
private List<Models.Commit> range = null; private List<Models.Commit> range = new List<Models.Commit>();
private List<Models.Change> cachedChanges = new List<Models.Change>(); private List<Models.Change> cachedChanges = new List<Models.Change>();
private string filter = null; private string filter = null;
private bool isSelecting = false; private bool isSelecting = false;
@ -31,6 +31,14 @@ namespace SourceGit.Views.Widgets {
InitializeComponent(); InitializeComponent();
} }
public void CleanUp() {
range.Clear();
cachedChanges.Clear();
modeTree.ItemsSource = new List<ChangeNode>();
modeGrid.ItemsSource = new List<Models.Change>();
modeList.ItemsSource = new List<Models.Change>();
}
public void SetData(string repo, List<Models.Commit> range, List<Models.Change> changes) { public void SetData(string repo, List<Models.Commit> range, List<Models.Change> changes) {
this.repo = repo; this.repo = repo;
this.range = range; this.range = range;

6
src/Views/Widgets/CommitDetail.xaml.cs
View file

@ -19,6 +19,12 @@ namespace SourceGit.Views.Widgets {
public CommitDetail() { public CommitDetail() {
InitializeComponent(); InitializeComponent();
Unloaded += (o, e) => {
changeList.ItemsSource = new List<Models.Change>();
changeContainer.CleanUp();
revisionFiles.Cleanup();
};
} }
public void SetData(string repo, Models.Commit commit) { public void SetData(string repo, Models.Commit commit) {

5
src/Views/Widgets/RevisionFiles.xaml.cs
View file

@ -32,7 +32,6 @@ namespace SourceGit.Views.Widgets {
public RevisionFiles() { public RevisionFiles() {
InitializeComponent(); InitializeComponent();
Unloaded += (o, e) => treeFiles.ItemsSource = new List<FileNode>();
} }
public void SetData(string repo, string sha, Commands.Context cancelToken) { public void SetData(string repo, string sha, Commands.Context cancelToken) {
@ -109,6 +108,10 @@ namespace SourceGit.Views.Widgets {
}); });
} }
public void Cleanup() {
treeFiles.ItemsSource = new List<FileNode>();
}
private void SortFileNodes(List<FileNode> nodes) { private void SortFileNodes(List<FileNode> nodes) {
nodes.Sort((l, r) => { nodes.Sort((l, r) => {
if (l.IsFolder == r.IsFolder) { if (l.IsFolder == r.IsFolder) {