optimize cache image placeholder presentation

DGP-Studio · Dec 31, 2023 · d2c33cf · d2c33cf
1 parent b49cd92
commit d2c33cf
Show file tree

Hide file tree

Showing 13 changed files with 248 additions and 251 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -69,12 +69,12 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             if (firstInstance.IsCurrent)
             {
                 logger.LogInformation(ConsoleBanner);
+                LogDiagnosticInformation();
 
                 // manually invoke
                 activation.NonRedirectToActivate(firstInstance, activatedEventArgs);
                 activation.InitializeWith(firstInstance);
 
-                LogDiagnosticInformation();
                 serviceProvider.GetRequiredService<IJumpListInterop>().ConfigureAsync().SafeForget();
             }
             else

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -4,6 +4,8 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Snap.Hutao.Core.Caching;
+using Snap.Hutao.Model.Metadata.Converter;
+using Snap.Hutao.Web;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Control.Image;
@@ -40,12 +42,7 @@ public CachedImage()
         {
             // The image is corrupted, remove it.
             imageCache.Remove(imageUri);
-            return null;
-        }
-        catch (OperationCanceledException)
-        {
-            // task was explicitly canceled
-            return null;
+            return default;
         }
     }
 }
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.xaml
@@ -17,6 +17,7 @@
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Image
                             Name="PlaceholderImage"
+                            Margin="{TemplateBinding PlaceholderMargin}"
                             HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalAlignment}"
                             Source="{TemplateBinding PlaceholderSource}"