github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-26 03:40:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: support compact folders display mode in changes tree view (#1674) (#1729)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-08-14 15:18:36 +08:00
parent ce23e8cb20
commit 237d4bc7e5
13 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/ViewModels/ChangeTreeNode.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.IO;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
@@ -7,6 +7,7 @@ namespace SourceGit.ViewModels
public class ChangeTreeNode : ObservableObject
{
public string FullPath { get; set; }
public string DisplayName { get; set; }
public int Depth { get; private set; } = 0;
public Models.Change Change { get; set; } = null;
public List<ChangeTreeNode> Children { get; set; } = new List<ChangeTreeNode>();
@@ -32,22 +33,22 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _isExpanded, value);
}
public ChangeTreeNode(Models.Change c, int depth)
public ChangeTreeNode(Models.Change c)
{
FullPath = c.Path;
Depth = depth;
DisplayName = Path.GetFileName(c.Path);
Change = c;
IsExpanded = false;
}
public ChangeTreeNode(string path, bool isExpanded, int depth)
public ChangeTreeNode(string path, bool isExpanded)
{
FullPath = path;
Depth = depth;
DisplayName = Path.GetFileName(path);
IsExpanded = isExpanded;
}
public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded)
public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded, bool compactFolders)
{
var nodes = new List<ChangeTreeNode>();
var folders = new Dictionary<string, ChangeTreeNode>();
@@ -57,12 +58,11 @@ namespace SourceGit.ViewModels
var sepIdx = c.Path.IndexOf('/');
if (sepIdx == -1)
{
nodes.Add(new ChangeTreeNode(c, 0));
nodes.Add(new ChangeTreeNode(c));
}
else
{
ChangeTreeNode lastFolder = null;
int depth = 0;
while (sepIdx != -1)
{
@@ -73,27 +73,32 @@ namespace SourceGit.ViewModels
}
else if (lastFolder == null)
{
lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder));
folders.Add(folder, lastFolder);
InsertFolder(nodes, lastFolder);
}
else
{
var cur = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
var cur = new ChangeTreeNode(folder, !folded.Contains(folder));
folders.Add(folder, cur);
InsertFolder(lastFolder.Children, cur);
lastFolder = cur;
}
depth++;
sepIdx = c.Path.IndexOf('/', sepIdx + 1);
}
lastFolder?.Children.Add(new ChangeTreeNode(c, depth));
lastFolder?.Children.Add(new ChangeTreeNode(c));
}
}
Sort(nodes);
if (compactFolders)
{
foreach (var node in nodes)
Compact(node);
}
SortAndSetDepth(nodes, 0);
folders.Clear();
return nodes;
@@ -113,12 +118,37 @@ namespace SourceGit.ViewModels
collection.Add(subFolder);
}
private static void Sort(List<ChangeTreeNode> nodes)
private static void Compact(ChangeTreeNode node)
{
var childrenCount = node.Children.Count;
if (childrenCount == 0)
return;
if (childrenCount > 1)
{
foreach (var c in node.Children)
Compact(c);
return;
}
var child = node.Children[0];
if (child.Change != null)
return;
node.FullPath = $"{node.FullPath}/{child.DisplayName}";
node.DisplayName = $"{node.DisplayName} / {child.DisplayName}";
node.IsExpanded = child.IsExpanded;
node.Children = child.Children;
Compact(node);
}
private static void SortAndSetDepth(List<ChangeTreeNode> nodes, int depth)
{
foreach (var node in nodes)
{
node.Depth = depth;
if (node.IsFolder)
Sort(node.Children);
SortAndSetDepth(node.Children, depth + 1);
}
nodes.Sort((l, r) =>

7
src/ViewModels/Preferences.cs
View File

@@ -267,6 +267,12 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _lfsImageActiveIdx, value);
}
public bool EnableCompactFoldersInChangesTree
{
get => _enableCompactFoldersInChangesTree;
set => SetProperty(ref _enableCompactFoldersInChangesTree, value);
}
public Models.ChangeViewMode UnstagedChangeViewMode
{
get => _unstagedChangeViewMode;
@@ -718,6 +724,7 @@ namespace SourceGit.ViewModels
private bool _useFullTextDiff = false;
private bool _useBlockNavigationInDiffView = false;
private int _lfsImageActiveIdx = 0;
private bool _enableCompactFoldersInChangesTree = false;
private Models.ChangeViewMode _unstagedChangeViewMode = Models.ChangeViewMode.List;
private Models.ChangeViewMode _stagedChangeViewMode = Models.ChangeViewMode.List;