From 05e3f0e5b88b56bfa4ccc97fb65a7d752e038ab1 Mon Sep 17 00:00:00 2001 From: Gadfly Date: Sat, 15 Mar 2025 22:13:10 +0800 Subject: [PATCH 1/2] enhance: add tooltips to various UI elements for better accessibility --- src/Converters/StringConverters.cs | 3 +++ src/Views/ChangeCollectionView.axaml | 13 ++++++++++--- src/Views/DiffView.axaml | 2 +- src/Views/Histories.axaml | 11 +++++++++-- src/Views/RevisionFiles.axaml | 2 +- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs index 5e4608c52..c371b859f 100644 --- a/src/Converters/StringConverters.cs +++ b/src/Converters/StringConverters.cs @@ -81,5 +81,8 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu 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/Views/ChangeCollectionView.axaml b/src/Views/ChangeCollectionView.axaml index 6ce3d0336..2b0f5bfac 100644 --- a/src/Views/ChangeCollectionView.axaml +++ b/src/Views/ChangeCollectionView.axaml @@ -39,7 +39,8 @@ + DoubleTapped="OnRowDoubleTapped" + ToolTip.Tip="{Binding FullPath}"> - + - + - + diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml index 583e17c17..4bd0d54d6 100644 --- a/src/Views/Histories.axaml +++ b/src/Views/Histories.axaml @@ -126,7 +126,11 @@ - + - + - + From 37f8049521c0b43a149fea5f6344a1ed4e69f183 Mon Sep 17 00:00:00 2001 From: Gadfly Date: Sat, 15 Mar 2025 22:19:13 +0800 Subject: [PATCH 2/2] 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 c371b859f..5e4608c52 100644 --- a/src/Converters/StringConverters.cs +++ b/src/Converters/StringConverters.cs @@ -81,8 +81,5 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu 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 850bcf2ff..066ab7476 100644 --- a/src/Models/User.cs +++ b/src/Models/User.cs @@ -43,6 +43,11 @@ public static User FindOrAdd(string data) 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 4bd0d54d6..afe2c1b73 100644 --- a/src/Views/Histories.axaml +++ b/src/Views/Histories.axaml @@ -166,7 +166,7 @@ + ToolTip.Tip="{Binding Author}">