diff --git a/src/Models/Change.cs b/src/Models/Change.cs index aaa2633f..129678be 100644 --- a/src/Models/Change.cs +++ b/src/Models/Change.cs @@ -53,7 +53,7 @@ namespace SourceGit.Models public bool IsConflicted => WorkTree == ChangeState.Conflicted; public string ConflictMarker => CONFLICT_MARKERS[(int)ConflictReason]; public string ConflictDesc => CONFLICT_DESCS[(int)ConflictReason]; - + public string WorkTreeDesc => TYPE_DESCS[(int)WorkTree]; public string IndexDesc => TYPE_DESCS[(int)Index]; @@ -87,17 +87,17 @@ namespace SourceGit.Models if (!string.IsNullOrEmpty(OriginalPath) && OriginalPath[0] == '"') OriginalPath = OriginalPath.Substring(1, OriginalPath.Length - 2); } - - private static readonly string[] TYPE_DESCS = + + private static readonly string[] TYPE_DESCS = [ "Unknown", "Modified", "Type Changed", - "Added", - "Deleted", - "Renamed", - "Copied", - "Untracked", + "Added", + "Deleted", + "Renamed", + "Copied", + "Untracked", "Conflict" ]; private static readonly string[] CONFLICT_MARKERS = diff --git a/src/Views/ChangeCollectionView.axaml.cs b/src/Views/ChangeCollectionView.axaml.cs index 2b50d5e6..6623a60b 100644 --- a/src/Views/ChangeCollectionView.axaml.cs +++ b/src/Views/ChangeCollectionView.axaml.cs @@ -235,10 +235,10 @@ namespace SourceGit.Views { if (sender is not Control control) return; - + if (control.DataContext is ViewModels.ChangeTreeNode node) { - if (node.Change is {} c) + if (node.Change is { } c) UpdateRowTips(control, c); else 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(change.ConflictDesc) { Foreground = Brushes.Gray }); } - + ToolTip.SetTip(control, tip); } - + private bool _disableSelectionChangingEvent = false; } }