From 01cf32a610b8ba1b5d6eaca7666a9c93f86310bf Mon Sep 17 00:00:00 2001
From: lincube <lincube3@hotmail.com>
Date: Mon, 25 May 2026 09:32:58 +0800
Subject: [PATCH] =?UTF-8?q?changed.=E8=B0=83=E6=95=B4=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E7=BB=84=E5=BA=93=E7=9A=84=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ComponentCategoryIconResolverTests.cs     | 14 +++++++++++
 .../ComponentCategoryIconResolver.cs          | 23 +++++++++++++++++--
 .../Views/ComponentLibraryWindow.axaml        |  2 +-
 .../FusedDesktopComponentLibraryWindow.axaml  |  1 +
 ...usedDesktopComponentLibraryWindow.axaml.cs | 22 ++++++++++++++++++
 5 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/LanMountainDesktop.Tests/ComponentCategoryIconResolverTests.cs b/LanMountainDesktop.Tests/ComponentCategoryIconResolverTests.cs
index d6fa02f..643103c 100644
--- a/LanMountainDesktop.Tests/ComponentCategoryIconResolverTests.cs
+++ b/LanMountainDesktop.Tests/ComponentCategoryIconResolverTests.cs
@@ -107,4 +107,18 @@ public sealed class ComponentCategoryIconResolverTests
         var result = ComponentCategoryIconResolver.ResolveCategoryIcon("File", components);
         Assert.Equal(Icon.Folder, result);
     }
+
+    [Fact]
+    public void ResolveCategoryIcon_Date_ResolvesCorrectly()
+    {
+        var result = ComponentCategoryIconResolver.ResolveCategoryIcon("Date", []);
+        Assert.Equal(Icon.Calendar, result);
+    }
+
+    [Fact]
+    public void ResolveCategoryIcon_Study_ResolvesCorrectly()
+    {
+        var result = ComponentCategoryIconResolver.ResolveCategoryIcon("Study", []);
+        Assert.Equal(Icon.Book, result);
+    }
 }
diff --git a/LanMountainDesktop/ComponentSystem/ComponentCategoryIconResolver.cs b/LanMountainDesktop/ComponentSystem/ComponentCategoryIconResolver.cs
index 1c85e44..78e4f69 100644
--- a/LanMountainDesktop/ComponentSystem/ComponentCategoryIconResolver.cs
+++ b/LanMountainDesktop/ComponentSystem/ComponentCategoryIconResolver.cs
@@ -14,15 +14,34 @@ public static class ComponentCategoryIconResolver
             return Icon.Apps;
         }
 
+        var icon = categoryId.ToLowerInvariant() switch
+        {
+            "clock" => Icon.Clock,
+            "date" => Icon.Calendar,
+            "weather" => Icon.WeatherSunny,
+            "board" => Icon.Edit,
+            "media" => Icon.Play,
+            "info" => Icon.News,
+            "calculator" => Icon.Calculator,
+            "study" => Icon.Book,
+            "file" => Icon.Folder,
+            _ => (Icon?)null
+        };
+
+        if (icon.HasValue)
+        {
+            return icon.Value;
+        }
+
         var firstComponent = categoryComponents.FirstOrDefault();
         if (firstComponent is null || string.IsNullOrWhiteSpace(firstComponent.IconKey))
         {
             return Icon.Apps;
         }
 
-        if (Enum.TryParse<Icon>(firstComponent.IconKey, ignoreCase: true, out var icon))
+        if (Enum.TryParse<Icon>(firstComponent.IconKey, ignoreCase: true, out var resolvedIcon))
         {
-            return icon;
+            return resolvedIcon;
         }
 
         return Icon.Apps;
diff --git a/LanMountainDesktop/Views/ComponentLibraryWindow.axaml b/LanMountainDesktop/Views/ComponentLibraryWindow.axaml
index 6589f1f..46519e9 100644
--- a/LanMountainDesktop/Views/ComponentLibraryWindow.axaml
+++ b/LanMountainDesktop/Views/ComponentLibraryWindow.axaml
@@ -54,7 +54,7 @@
                                     Background="{DynamicResource AdaptiveNavItemBackgroundBrush}">
                                 <Grid ColumnDefinitions="Auto,*"
                                       ColumnSpacing="8">
-                                    <fi:SymbolIcon Symbol="{Binding Icon}"
+                                    <fi:FluentIcon Icon="{Binding Icon}"
                                                    IconVariant="Regular"
                                                    FontSize="16" />
                                     <TextBlock Grid.Column="1"
diff --git a/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml b/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml
index 3303c4c..945398c 100644
--- a/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml
+++ b/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml
@@ -23,6 +23,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Padding="0"
+                CornerRadius="{DynamicResource DesignCornerRadiusLg}"
                 ClipToBounds="True">
             <Grid RowDefinitions="Auto,*,Auto">
                 <Border Height="64"
diff --git a/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs b/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs
index d531b28..64ca2c3 100644
--- a/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs
+++ b/LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs
@@ -4,7 +4,9 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using LanMountainDesktop.Appearance;
 using LanMountainDesktop.Services;
+using LanMountainDesktop.Settings.Core;
 
 namespace LanMountainDesktop.Views;
 
@@ -15,6 +17,7 @@ public partial class FusedDesktopComponentLibraryWindow : Window
     public FusedDesktopComponentLibraryWindow()
     {
         InitializeComponent();
+        ApplyFluentCornerRadius();
 
         LibraryControl.AddComponentRequested += OnAddComponentRequested;
         KeyDown += OnWindowKeyDown;
@@ -23,6 +26,25 @@ public partial class FusedDesktopComponentLibraryWindow : Window
         mainWindow?.RegisterFusedLibraryWindow(this);
     }
 
+    private void ApplyFluentCornerRadius()
+    {
+        if (RootGrid is null)
+        {
+            return;
+        }
+
+        var tokens = AppearanceCornerRadiusTokenFactory.Create(
+            GlobalAppearanceSettings.CornerRadiusStyleFluent);
+        RootGrid.Resources["DesignCornerRadiusMicro"] = tokens.Micro;
+        RootGrid.Resources["DesignCornerRadiusXs"] = tokens.Xs;
+        RootGrid.Resources["DesignCornerRadiusSm"] = tokens.Sm;
+        RootGrid.Resources["DesignCornerRadiusMd"] = tokens.Md;
+        RootGrid.Resources["DesignCornerRadiusLg"] = tokens.Lg;
+        RootGrid.Resources["DesignCornerRadiusXl"] = tokens.Xl;
+        RootGrid.Resources["DesignCornerRadiusIsland"] = tokens.Island;
+        RootGrid.Resources["DesignCornerRadiusComponent"] = tokens.Component;
+    }
+
     public bool PreserveEditModeOnClose { get; private set; }
 
     public void SetOverlayWindow(TransparentOverlayWindow overlayWindow)