修复 UWP索引错误

优化字体显示
MakesYT · Jun 1, 2024 · 48eda01 · 48eda01
1 parent ce053f5
commit 48eda01
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 36 deletions.
diff --git a/Core.Window/UWPTools.cs b/Core.Window/UWPTools.cs
@@ -9,7 +9,6 @@
 using Vanara.Extensions;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
-using WinRT;
 
 #endregion
 
@@ -40,18 +39,15 @@ internal static class UwpTools
 
     internal static async Task GetAll(ConcurrentDictionary<string, SearchViewItem> items)
     {
-
-        List<Task> list = new();
+        ConcurrentBag<Task> list = new();
         FirewallApi.NetworkIsolationEnumAppContainers(FirewallApi.NETISO_FLAG.NETISO_FLAG_FORCE_COMPUTE_BINARIES,
             out var pdwNuminternalAppCs, out var ppinternalAppCs);
         var options = new ParallelOptions
         {
             MaxDegreeOfParallelism = 256
         };
         Parallel.ForEach(ppinternalAppCs.ToIEnum<FirewallApi.INET_FIREWALL_APP_CONTAINER>(
-            (int)pdwNuminternalAppCs), options,file => {
-            list.Add(AppContainerAnalyse(file, items));
-        });
+            (int)pdwNuminternalAppCs), options, file => { list.Add(AppContainerAnalyse(file, items)); });
 
         await Task.WhenAll(list.ToArray());
     }
@@ -88,8 +84,7 @@ private static async Task AppContainerAnalyse(FirewallApi.INET_FIREWALL_APP_CONT
             return;
         }
 
-
-
+
         var xmlDocument = new XmlDocument();
         if (File.Exists($"{appContainer.workingDirectory}{Path.DirectorySeparatorChar}AppxManifest.xml"))
         {
@@ -147,7 +142,10 @@ private static async Task AppContainerAnalyse(FirewallApi.INET_FIREWALL_APP_CONT
         }
 
         var squareLogo = visualElementsAttribute.Value;
-        var logoName = squareLogo.Split(Path.DirectorySeparatorChar).Last().Split(".").First();
+        var logoName = squareLogo.Split(Path.DirectorySeparatorChar)
+                                 .Last()
+                                 .Split(".")
+                                 .First();
         var path = $"{appContainer.workingDirectory}{squareLogo.Split(Path.DirectorySeparatorChar).First()}";
         if (!Directory.Exists(path))
         {
@@ -164,12 +162,12 @@ private static async Task AppContainerAnalyse(FirewallApi.INET_FIREWALL_APP_CONT
                 ItemDisplayName = fileName,
                 OnlyKey = $"{appContainer.appContainerName}!{id}",
                 FileType = FileType.UWP应用,
-                PinyinItem =  Window.AppTools.NameSolver(fileName),
+                PinyinItem = Window.AppTools.NameSolver(fileName),
                 IconPath = pa,
                 IsVisible = true
             };
 
-           
+
             //Console.WriteLine(searchViewItem);
             items.TryAdd(searchViewItem.OnlyKey, searchViewItem);
             return;
@@ -185,7 +183,7 @@ private static async Task AppContainerAnalyse(FirewallApi.INET_FIREWALL_APP_CONT
                         ItemDisplayName = fileName,
                         OnlyKey = $"{appContainer.appContainerName}!{id}",
                         FileType = FileType.UWP应用,
-                        PinyinItem =  Window.AppTools.NameSolver(fileName),
+                        PinyinItem = Window.AppTools.NameSolver(fileName),
                         IconPath = enumerateFile.FullName,
                         IsVisible = true
                     };

diff --git a/KitopiaAvalonia/Program.cs b/KitopiaAvalonia/Program.cs
@@ -66,6 +66,11 @@ public static AppBuilder BuildAvaloniaApp()
                 }
             },
         });
+        buildAvaloniaApp.With(new RenderOptions()
+        {
+            TextRenderingMode = TextRenderingMode.Antialias,
+            EdgeMode = EdgeMode.Antialias,
+        });
         buildAvaloniaApp.LogToTrace();
 
         return buildAvaloniaApp;

diff --git a/KitopiaAvalonia/Windows/Dialog.axaml.cs b/KitopiaAvalonia/Windows/Dialog.axaml.cs
@@ -1,7 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.Media;
 using Core.SDKs;
 
 namespace KitopiaAvalonia.Controls;
@@ -17,13 +16,11 @@ public partial class Dialog : Window
     public Dialog()
     {
         InitializeComponent();
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
     }
 
     public Dialog(DialogContent content)
     {
         InitializeComponent();
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         Title.Text = content.Title;
         Content.Content = content.Content;
 
@@ -32,8 +29,7 @@ public Dialog(DialogContent content)
         {
             PrimaryButton.Content = content.PrimaryButtonText;
 
-            PrimaryButton.Click += (sender, args) =>
-            {
+            PrimaryButton.Click += (sender, args) => {
                 this.Close();
                 content.PrimaryAction?.Invoke();
             };
@@ -43,8 +39,7 @@ public Dialog(DialogContent content)
         if (content.CloseButtonText != null)
         {
             CloseButton.Content = content.CloseButtonText;
-            CloseButton.Click += (sender, args) =>
-            {
+            CloseButton.Click += (sender, args) => {
                 this.Close();
                 content.CloseAction?.Invoke();
             };
@@ -54,8 +49,7 @@ public Dialog(DialogContent content)
         if (content.SecondaryButtonText != null)
         {
             SecondaryButton.Content = content.SecondaryButtonText;
-            SecondaryButton.Click += (sender, args) =>
-            {
+            SecondaryButton.Click += (sender, args) => {
                 this.Close();
                 content.SecondaryAction?.Invoke();
             };

diff --git a/KitopiaAvalonia/Windows/HotKeyEditorWindow.axaml.cs b/KitopiaAvalonia/Windows/HotKeyEditorWindow.axaml.cs
@@ -1,17 +1,10 @@
-using System.Linq;
-using Avalonia.Controls;
-using Avalonia.Input;
+using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Media;
 using Avalonia.Win32.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Core.SDKs;
 using Core.SDKs.HotKey;
-using Core.SDKs.Services;
 using Core.SDKs.Services.Config;
 using log4net;
-using Microsoft.Extensions.DependencyInjection;
-using HotKeyManager = Core.SDKs.HotKey.HotKeyManager;
 using Window = Avalonia.Controls.Window;
 
 namespace KitopiaAvalonia.Windows;
@@ -27,7 +20,6 @@ public partial class HotKeyEditorWindow : Window
     public HotKeyEditorWindow(HotKeyModel hotKeyModel)
     {
         InitializeComponent();
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         _hotKeyModel = hotKeyModel;
         Name.Text = $"快捷键:{hotKeyModel.SignName}";
 

diff --git a/KitopiaAvalonia/Windows/MainWindow.axaml.cs b/KitopiaAvalonia/Windows/MainWindow.axaml.cs
@@ -10,7 +10,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
-using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.Threading;
 using Core.SDKs.CustomScenario;
@@ -81,7 +80,6 @@ public MainWindow()
             e.Handled = true;
             log.Fatal(e.Exception);
         };
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         TitleBar.ExtendsContentIntoTitleBar = true;
         TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
         FrameView.NavigationPageFactory = new NavigationPageFactory();

diff --git a/KitopiaAvalonia/Windows/SearchWindow.axaml.cs b/KitopiaAvalonia/Windows/SearchWindow.axaml.cs
@@ -5,7 +5,6 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Media;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.Messaging;
 using Core.SDKs.Services;
@@ -21,7 +20,6 @@ public partial class SearchWindow : Window
     public SearchWindow()
     {
         InitializeComponent();
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         WeakReferenceMessenger.Default.Register<string, string>(this, "SearchWindowClose",
             (_, _) => { Dispatcher.UIThread.InvokeAsync(() => { IsVisible = false; }); });
     }

diff --git a/KitopiaAvalonia/Windows/TaskEditor.axaml.cs b/KitopiaAvalonia/Windows/TaskEditor.axaml.cs
@@ -8,7 +8,6 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
-using Avalonia.Media;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using Core.SDKs.CustomScenario;
@@ -36,7 +35,6 @@ public partial class TaskEditor : AppWindow
     public TaskEditor()
     {
         InitializeComponent();
-        RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
         if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             var size = desktop.MainWindow.Screens.Primary.Bounds.Size;