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

code_style: run dotnet format
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Details
Continuous Integration / Prepare version string (push) Waiting to run
Details
Continuous Integration / Package (push) Blocked by required conditions
Details

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-01 11:23:04 +08:00
parent fa004ce31b
commit 57004c4baf
No known key found for this signature in database
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Models/Change.cs
View file

@ -53,7 +53,7 @@ namespace SourceGit.Models
public bool IsConflicted => WorkTree == ChangeState.Conflicted; public bool IsConflicted => WorkTree == ChangeState.Conflicted;
public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason]; public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason];
public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason]; public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason];
public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree]; public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree];
public string IndexDesc => TYPE_DESCS[(int)Index]; public string IndexDesc => TYPE_DESCS[(int)Index];
@ -87,17 +87,17 @@ namespace SourceGit.Models
if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"') if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"')
OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2); OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2);
} }
private static readonly string[] TYPE_DESCS = private static readonly string[] TYPE_DESCS =
[ [
"Unknown", "Unknown",
"Modified", "Modified",
"Type Changed", "Type Changed",
"Added", "Added",
"Deleted", "Deleted",
"Renamed", "Renamed",
"Copied", "Copied",
"Untracked", "Untracked",
"Conflict" "Conflict"
]; ];
private static readonly string[] CONFLICT_MARKERS = private static readonly string[] CONFLICT_MARKERS =

8
src/Views/ChangeCollectionView.axaml.cs
View file

@ -235,10 +235,10 @@ namespace SourceGit.Views
{ {
if (sender is not Control control) if (sender is not Control control)
return; return;
if (control.DataContext is ViewModels.ChangeTreeNode node) if (control.DataContext is ViewModels.ChangeTreeNode node)
{ {
if (node.Change is {} c) if (node.Change is { } c)
UpdateRowTips(control, c); UpdateRowTips(control, c);
else else
ToolTip.SetTip(control, node.FullPath); ToolTip.SetTip(control, node.FullPath);
@ -501,10 +501,10 @@ namespace SourceGit.Views
tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray }); tip.Inlines!.Add(new Run(" • ") { Foreground = Brushes.Gray });
tip.Inlines!.Add(new Run(change.ConflictDesc) { Foreground = Brushes.Gray }); tip.Inlines!.Add(new Run(change.ConflictDesc) { Foreground = Brushes.Gray });
} }
ToolTip.SetTip(control, tip); ToolTip.SetTip(control, tip);
} }
private bool _disableSelectionChangingEvent = false; private bool _disableSelectionChangingEvent = false;
} }
} }