comments and ModelMergeTest

deansheather · deansheather · commit 6b1b4cbba57c · 2025-05-07T13:49:33.000+10:00
diff --git a/App/Utils/ModelMerge.cs b/App/Utils/ModelMerge.cs
@@ -29,7 +29,7 @@ public static class ModelMerge
     ///     to avoid excessive/unncessary UI updates.
     ///     It's assumed that the target list is already sorted.
     /// </summary>
-    public static void MergeLists<T>(IList<T> target, IList<T> update, Comparison<T> sorter)
+    public static void MergeLists<T>(IList<T> target, IEnumerable<T> update, Comparison<T> sorter)
         where T : IModelMergeable<T>
     {
         var newItems = update.ToList();
@@ -54,7 +54,7 @@ public static void MergeLists<T>(IList<T> target, IList<T> update, Comparison<T>
 
             // A merge couldn't occur, so we need to remove the old item and
             // decrement `i` for the next iteration.
-            target.Remove(target[i]);
+            target.RemoveAt(i);
             i--;
 
             OuterLoopEnd: ;
diff --git a/App/ViewModels/AgentAppViewModel.cs b/App/ViewModels/AgentAppViewModel.cs
@@ -40,16 +40,11 @@ public AgentAppViewModel Create(Uuid id, string name, Uri appUri, Uri? iconUrl)
 
 public partial class AgentAppViewModel : ObservableObject, IModelMergeable<AgentAppViewModel>
 {
-    // HACK: We need to set the icon size for SVGs otherwise they might get cut
-    //       off. These must be kept in sync with the XAML code.
-    public const int IconWidth = 20;
-    public const int IconHeight = 20;
-
     private readonly ILogger<AgentAppViewModel> _logger;
 
     public required Uuid Id { get; init; }
 
-    public required string Name { get; set; }
+    [ObservableProperty] public required partial string Name { get; set; }
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(Details))]
@@ -82,11 +77,7 @@ public ImageSource ImageSource
             {
                 // TODO: Some SVGs like `/icon/cursor.svg` contain PNG data and
                 //       don't render at all.
-                var svg = new SvgImageSource(IconUrl)
-                {
-                    RasterizePixelWidth = IconWidth,
-                    RasterizePixelHeight = IconHeight,
-                };
+                var svg = new SvgImageSource(IconUrl);
                 svg.Opened += (_, _) => _logger.LogDebug("app icon opened (svg): {uri}", IconUrl);
                 svg.OpenFailed += (_, args) =>
                     _logger.LogDebug("app icon failed to open (svg): {uri}: {Status}", IconUrl, args.Status);
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -259,7 +259,6 @@
                                             ToolTipService.ToolTip="{x:Bind Details}">
 
                                             <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                                                <!-- Icon width and height need to be synced to the constants in the view model -->
                                                 <Image
                                                     Source="{x:Bind ImageSource}"
                                                     ImageOpened="{x:Bind OnImageOpened}"
diff --git a/Tests.App/Utils/ModelMergeTest.cs b/Tests.App/Utils/ModelMergeTest.cs
