From 37f8049521c0b43a149fea5f6344a1ed4e69f183 Mon Sep 17 00:00:00 2001 From: Gadfly Date: Sat, 15 Mar 2025 22:19:13 +0800 Subject: [PATCH] refactor: simplify user string conversion --- src/Converters/StringConverters.cs | 3 --- src/Models/User.cs | 5 +++++ src/Views/Histories.axaml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs index c371b859..5e4608c5 100644 --- a/src/Converters/StringConverters.cs +++ b/src/Converters/StringConverters.cs @@ -81,8 +81,5 @@ namespace SourceGit.Converters public static readonly FuncValueConverter ContainsSpaces = new FuncValueConverter(v => v != null && v.Contains(' ')); - - public static readonly FuncValueConverter UserToString = - new FuncValueConverter(v => v == null ? string.Empty : $"{v.Name} <{v.Email}>"); } } diff --git a/src/Models/User.cs b/src/Models/User.cs index 850bcf2f..066ab747 100644 --- a/src/Models/User.cs +++ b/src/Models/User.cs @@ -43,6 +43,11 @@ namespace SourceGit.Models return _caches.GetOrAdd(data, key => new User(key)); } + public override string ToString() + { + return $"{Name} <{Email}>"; + } + private static ConcurrentDictionary _caches = new ConcurrentDictionary(); private readonly int _hash; } diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml index 4bd0d54d..afe2c1b7 100644 --- a/src/Views/Histories.axaml +++ b/src/Views/Histories.axaml @@ -166,7 +166,7 @@ + ToolTip.Tip="{Binding Author}">