feat.试验性地改了一下融合桌面的组件库，反正还是不能用。

LanMountainDesktop/Localization/en-US.json

@@ -698,6 +698,7 @@
     "component.editor.placement_label": "Placement ID",
     "component.editor.scope_label": "Scope",
     "component.editor.scope_instance": "Instance-scoped editor",
+    "component_category.all":  "All",
     "component_category.clock":  "Clock",
     "component_category.date":  "Calendar",
     "component_category.weather":  "Weather",

LanMountainDesktop/Localization/zh-CN.json

@@ -692,6 +692,7 @@
     "component.editor.placement_label": "实例 ID",
     "component.editor.scope_label": "作用域",
     "component.editor.scope_instance": "实例级编辑器",
+    "component_category.all":  "全部",
     "component_category.clock":  "时钟",
     "component_category.date":  "日历",
     "component_category.weather":  "天气",

LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml

@@ -1,116 +1,138 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:vm="using:LanMountainDesktop.ViewModels"
-             xmlns:fi="using:FluentIcons.Avalonia"
+             xmlns:ui="using:FluentAvalonia.UI.Controls"
+             xmlns:fi="using:FluentIcons.Avalonia.Fluent"
              xmlns:converters="using:Avalonia.Data.Converters"
              x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryControl"
              x:DataType="vm:ComponentLibraryWindowViewModel">
 
     <UserControl.Styles>
-        <!-- 分类列表项样式 -->
+        <!-- 分类列表项样式 - 遵循 Fluent NavigationView 风格 -->
         <Style Selector="ListBoxItem.category-item">
             <Setter Property="Padding" Value="0"/>
-            <Setter Property="Margin" Value="0,0,0,4"/>
+            <Setter Property="Margin" Value="0,2"/>
             <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusSm}"/>
+            <Setter Property="Transitions">
+                <Transitions>
+                    <BrushTransition Property="Background" Duration="0:0:0.083" Easing="0.05,0.75,0.10,1.00"/>
+                </Transitions>
+            </Setter>
         </Style>
         <Style Selector="ListBoxItem.category-item:pointerover /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
         </Style>
         <Style Selector="ListBoxItem.category-item:selected /template/ ContentPresenter#PART_ContentPresenter">
-            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Background" Value="{DynamicResource AdaptiveNavItemSelectedBackgroundBrush}"/>
+        </Style>
+        <Style Selector="ListBoxItem.category-item:pressed /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
         </Style>
 
-        <!-- 分类项内容容器 - 默认状态 -->
-        <Style Selector="Border.category-content">
-            <Setter Property="Background" Value="{DynamicResource AdaptiveNavItemBackgroundBrush}"/>
-            <Setter Property="Padding" Value="12,10"/>
-            <Setter Property="CornerRadius" Value="{DynamicResource DesignCornerRadiusMd}"/>
-        </Style>
-        <Style Selector="ListBoxItem.category-item:selected Border.category-content">
-            <Setter Property="Background" Value="{DynamicResource AdaptiveAccentBrush}"/>
-        </Style>
-        <Style Selector="ListBoxItem.category-item:pointerover Border.category-content">
-            <Setter Property="Opacity" Value="0.9"/>
-        </Style>
-
-        <!-- 分类项图标和文字 - 默认状态 -->
-        <Style Selector="ListBoxItem.category-item fi|SymbolIcon.category-icon">
+        <!-- 分类项图标和文字 -->
+        <Style Selector="ListBoxItem.category-item fi|FluentIcon.category-icon">
             <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
         </Style>
-        <Style Selector="ListBoxItem.category-item:selected fi|SymbolIcon.category-icon">
-            <Setter Property="Foreground" Value="{DynamicResource AdaptiveOnAccentBrush}"/>
+        <Style Selector="ListBoxItem.category-item:selected fi|FluentIcon.category-icon">
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
         </Style>
 
         <Style Selector="ListBoxItem.category-item TextBlock.category-text">
             <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
         </Style>
         <Style Selector="ListBoxItem.category-item:selected TextBlock.category-text">
-            <Setter Property="Foreground" Value="{DynamicResource AdaptiveOnAccentBrush}"/>
+            <Setter Property="Foreground" Value="{DynamicResource AdaptiveTextPrimaryBrush}"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
         </Style>
     </UserControl.Styles>
 
-    <Grid ColumnDefinitions="280,*"
-          ColumnSpacing="16"
+    <Grid ColumnDefinitions="Auto,*"
+          ColumnSpacing="0"
           Margin="0">
-        <!-- 分类列表 (左侧) -->
-        <Border Classes="surface-translucent-panel"
-                CornerRadius="{DynamicResource DesignCornerRadiusLg}"
-                Padding="12">
-            <ListBox x:Name="CategoryListBox"
-                     Background="Transparent"
-                     BorderThickness="0"
-                     SelectionChanged="OnCategorySelectionChanged"
-                     ItemsSource="{Binding Categories}">
-                <ListBox.ItemTemplate>
-                    <DataTemplate x:DataType="vm:ComponentLibraryCategoryViewModel">
-                        <Border Classes="category-content">
+        <!-- 左侧导航列 - 分类列表 + 底部"查找更多组件" -->
+        <Border Width="280"
+                Background="Transparent">
+            <Grid RowDefinitions="*,Auto">
+                <!-- 分类列表 -->
+                <ListBox x:Name="CategoryListBox"
+                         Grid.Row="0"
+                         Background="Transparent"
+                         BorderThickness="0"
+                         Margin="8,8,4,0"
+                         SelectionChanged="OnCategorySelectionChanged"
+                         ItemsSource="{Binding Categories}">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate x:DataType="vm:ComponentLibraryCategoryViewModel">
                             <Grid ColumnDefinitions="Auto,*"
-                                  ColumnSpacing="12">
-                                <fi:SymbolIcon Symbol="{Binding Icon}"
+                                  ColumnSpacing="12"
+                                  Margin="12,10">
+                                <fi:FluentIcon Icon="{Binding Icon}"
                                                IconVariant="Regular"
-                                               FontSize="20"
+                                               FontSize="18"
                                                Classes="category-icon"/>
                                 <TextBlock Grid.Column="1"
                                            VerticalAlignment="Center"
                                            FontSize="14"
-                                           FontWeight="SemiBold"
                                            Classes="category-text"
                                            Text="{Binding Title}"/>
                             </Grid>
-                        </Border>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+
+                <!-- 底部"查找更多组件" - 在左侧导航列底部 -->
+                <StackPanel Grid.Row="1"
+                            Margin="12,8,8,12">
+                    <Border Height="1"
+                            Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
+                            Opacity="0.4"
+                            Margin="0,0,0,8"/>
+                    <Button Classes="hyperlink"
+                            HorizontalAlignment="Left"
+                            Click="OnFindMoreComponentsClick">
+                        <StackPanel Orientation="Horizontal" Spacing="6">
+                            <fi:FluentIcon Icon="Globe" IconVariant="Regular" FontSize="14"/>
+                            <TextBlock Text="查找更多组件"/>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
         </Border>
 
-        <!-- 组件预览区 (右侧) -->
+        <!-- 右侧内容区与左侧的分隔线 -->
         <Border Grid.Column="1"
-                Classes="surface-translucent-strong"
-                CornerRadius="{DynamicResource DesignCornerRadiusLg}"
-                Padding="24">
-            <Panel>
+                Width="1"
+                HorizontalAlignment="Left"
+                Background="{DynamicResource AdaptiveGlassPanelBorderBrush}"
+                Opacity="0.5"/>
+
+        <!-- 组件预览区 (右侧) -->
+        <ScrollViewer Grid.Column="1"
+                      VerticalScrollBarVisibility="Auto"
+                      HorizontalScrollBarVisibility="Disabled">
+            <StackPanel Margin="24,16,20,16"
+                        Spacing="0">
+
                 <!-- 有选中组件时的显示 -->
-                <Grid RowDefinitions="Auto,*,Auto"
-                      IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}">
-                    <!-- 组件标题 -->
-                    <TextBlock Grid.Row="0"
-                               FontSize="28"
-                               FontWeight="Bold"
+                <Panel IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNotNull}}">
+
+                    <!-- 组件标题 - 在右侧内容区顶部 -->
+                    <TextBlock FontSize="28"
+                               FontWeight="SemiBold"
                                Foreground="{DynamicResource AdaptiveTextPrimaryBrush}"
                                Text="{Binding SelectedComponent.DisplayName}"
-                               Margin="0,0,0,20"/>
+                               Margin="0,0,0,16"/>
 
-                    <!-- 预览区域 -->
-                    <Border Grid.Row="1"
-                            CornerRadius="{DynamicResource DesignCornerRadiusComponent}"
-                            Background="{DynamicResource AdaptiveSurfaceBaseBrush}"
+                    <!-- 固定大小的预览卡片 - 与窗口背景有色差 -->
+                    <Border CornerRadius="{DynamicResource DesignCornerRadiusSm}"
+                            Background="{DynamicResource AdaptiveSurfaceRaisedBrush}"
                             BorderBrush="{DynamicResource AdaptiveGlassPanelBorderBrush}"
                             BorderThickness="1"
-                            Padding="20"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center">
-                        <Grid Width="400"
-                              Height="300">
+                            Width="420"
+                            Height="320"
+                            HorizontalAlignment="Center">
+                        <Grid Margin="16">
                             <!-- 预览图片 -->
                             <Image Source="{Binding SelectedComponent.PreviewBitmap}"
                                    Stretch="Uniform"
@@ -141,7 +163,8 @@
                                 <StackPanel HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Spacing="8">
-                                    <fi:SymbolIcon Symbol="ImageOff"
+                                    <fi:FluentIcon Icon="ImageOff"
+                                                   IconVariant="Regular"
                                                    FontSize="48"
                                                    Opacity="0.5"
                                                    Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
@@ -161,34 +184,29 @@
                         </Grid>
                     </Border>
 
-                    <!-- 底部操作区 -->
-                    <Grid Grid.Row="2"
-                          ColumnDefinitions="*,Auto"
-                          Margin="0,24,0,0">
-                        <TextBlock Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   FontSize="14"
-                                   Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"
-                                   Text="{Binding SelectedComponent.ComponentId, StringFormat='组件 ID: {0}'}"/>
-                        <Button Grid.Column="1"
-                                Classes="accent"
-                                Padding="20,12"
-                                Tag="{Binding SelectedComponent.ComponentId}"
-                                Click="OnAddComponentClick">
-                            <StackPanel Orientation="Horizontal" Spacing="8">
-                                <fi:SymbolIcon Symbol="Add" FontSize="16"/>
-                                <TextBlock Text="添加到桌面" FontWeight="SemiBold"/>
-                            </StackPanel>
-                        </Button>
-                    </Grid>
-                </Grid>
+                    <!-- "添加小组件"按钮 - 在预览卡片正下方居中，使用主题强调色 -->
+                    <Button HorizontalAlignment="Center"
+                            Classes="accent"
+                            Padding="24,10"
+                            Margin="0,16,0,0"
+                            Tag="{Binding SelectedComponent.ComponentId}"
+                            Click="OnAddComponentClick">
+                        <StackPanel Orientation="Horizontal" Spacing="8">
+                            <fi:FluentIcon Icon="Add" IconVariant="Regular" FontSize="16"/>
+                            <TextBlock Text="添加小组件" FontWeight="SemiBold"/>
+                        </StackPanel>
+                    </Button>
+                </Panel>
 
                 <!-- 空状态 -->
                 <Grid IsVisible="{Binding SelectedComponent, Converter={x:Static converters:ObjectConverters.IsNull}}"
                       HorizontalAlignment="Center"
-                      VerticalAlignment="Center">
-                    <StackPanel Spacing="16" HorizontalAlignment="Center">
-                        <fi:SymbolIcon Symbol="Apps"
+                      VerticalAlignment="Center"
+                      MinHeight="400">
+                    <StackPanel Spacing="16" HorizontalAlignment="Center"
+                                VerticalAlignment="Center">
+                        <fi:FluentIcon Icon="Apps"
+                                       IconVariant="Regular"
                                        FontSize="64"
                                        Opacity="0.3"
                                        Foreground="{DynamicResource AdaptiveTextSecondaryBrush}"/>
@@ -198,7 +216,7 @@
                                    Text="请从左侧选择一个组件"/>
                     </StackPanel>
                 </Grid>
-            </Panel>
-        </Border>
+            </StackPanel>
+        </ScrollViewer>
     </Grid>
 </UserControl>

LanMountainDesktop/Views/FusedDesktopComponentLibraryControl.axaml.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.VisualTree;
 using FluentIcons.Common;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.Services;
@@ -29,6 +30,8 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
     private readonly IRecommendationInfoService _recommendationInfoService = new RecommendationDataService();
     private readonly ICalculatorDataService _calculatorDataService = new CalculatorDataService();
 
+    private static readonly LocalizationService _localizationService = new();
+
     public FusedDesktopComponentLibraryControl()
     {
         InitializeComponent();
@@ -76,26 +79,15 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
     {
         _viewModel.Categories.Clear();
 
+        var languageCode = _settingsFacade.Region.Get().LanguageCode;
+
         // 添加"全部组件"分类
         _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
             "all",
-            "全部组件",
+            L(languageCode, "component_category.all", "All"),
             Symbol.Apps,
             Array.Empty<ComponentLibraryItemViewModel>()));
 
-        var categoryMap = new Dictionary<string, (string Display, Symbol Icon)>
-        {
-            { "clock", ("时钟", Symbol.Clock) },
-            { "date", ("日历", Symbol.CalendarDate) },
-            { "weather", ("天气", Symbol.WeatherSunny) },
-            { "board", ("画板", Symbol.Edit) },
-            { "media", ("媒体", Symbol.Play) },
-            { "info", ("资讯", Symbol.News) },
-            { "calculator", ("工具", Symbol.Calculator) },
-            { "study", ("学习", Symbol.Hourglass) },
-            { "file", ("文件", Symbol.Folder) }
-        };
-
         var usedCategories = _allDefinitions
             .Select(d => d.Category)
             .Distinct()
@@ -103,23 +95,62 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
 
         foreach (var cat in usedCategories)
         {
-            if (categoryMap.TryGetValue(cat.ToLower(), out var info))
-            {
-                var categoryComponents = _allDefinitions
-                    .Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
-                    .OrderBy(d => d.DisplayName)
-                    .Select(d => CreateComponentItem(d))
-                    .ToArray();
+            var icon = ResolveCategoryIcon(cat);
+            var title = GetLocalizedCategoryTitle(languageCode, cat);
 
-                _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
-                    cat,
-                    info.Display,
-                    info.Icon,
-                    categoryComponents));
-            }
+            var categoryComponents = _allDefinitions
+                .Where(d => string.Equals(d.Category, cat, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(d => d.DisplayName)
+                .Select(d => CreateComponentItem(d))
+                .ToArray();
+
+            _viewModel.Categories.Add(new ComponentLibraryCategoryViewModel(
+                cat,
+                title,
+                icon,
+                categoryComponents));
         }
     }
 
+    /// <summary>
+    /// 分类图标映射 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
+    /// </summary>
+    private static Symbol ResolveCategoryIcon(string categoryId)
+    {
+        if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return Symbol.Clock;
+        if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return Symbol.CalendarDate;
+        if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return Symbol.WeatherSunny;
+        if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return Symbol.Edit;
+        if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return Symbol.Play;
+        if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return Symbol.Apps;
+        if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return Symbol.Calculator;
+        if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return Symbol.Hourglass;
+        if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return Symbol.Folder;
+        return Symbol.Apps;
+    }
+
+    /// <summary>
+    /// 分类本地化标题 - 与阑山桌面 Dock 栏组件库 (MainWindow.ComponentSystem) 保持一致
+    /// </summary>
+    private string GetLocalizedCategoryTitle(string languageCode, string categoryId)
+    {
+        if (string.Equals(categoryId, "Clock", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.clock", "Clock");
+        if (string.Equals(categoryId, "Date", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.date", "Calendar");
+        if (string.Equals(categoryId, "Weather", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.weather", "Weather");
+        if (string.Equals(categoryId, "Board", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.board", "Board");
+        if (string.Equals(categoryId, "Media", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.media", "Media");
+        if (string.Equals(categoryId, "Info", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.info", "Info");
+        if (string.Equals(categoryId, "Calculator", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.calculator", "Calculator");
+        if (string.Equals(categoryId, "Study", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.study", "Study");
+        if (string.Equals(categoryId, "File", StringComparison.OrdinalIgnoreCase)) return L(languageCode, "component_category.file", "File");
+        return categoryId;
+    }
+
+    private string L(string languageCode, string key, string fallback)
+    {
+        return _localizationService.GetString(languageCode, key, fallback);
+    }
+
     private ComponentLibraryItemViewModel CreateComponentItem(DesktopComponentDefinition definition)
     {
         var previewKey = ComponentPreviewKey.ForComponentType(
@@ -221,4 +252,22 @@ public partial class FusedDesktopComponentLibraryControl : UserControl
             AddComponentRequested?.Invoke(this, componentId);
         }
     }
+
+    private void OnFindMoreComponentsClick(object? sender, RoutedEventArgs e)
+    {
+        // 打开设置窗口并导航到插件目录页面
+        if (Application.Current is App app && app.SettingsWindowService is { } settingsWindowService)
+        {
+            var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow as MainWindow;
+            var request = new SettingsWindowOpenRequest(
+                Source: "FusedDesktopComponentLibrary",
+                Owner: mainWindow,
+                PageId: "plugin-catalog");
+            settingsWindowService.Open(request);
+        }
+
+        // 关闭所在窗口
+        var window = this.FindAncestorOfType<Window>();
+        window?.Close();
+    }
 }

LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml

@@ -1,69 +1,73 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:controls="using:LanMountainDesktop.Views"
-        xmlns:fi="using:FluentIcons.Avalonia"
+        xmlns:fi="using:FluentIcons.Avalonia.Fluent"
         x:Class="LanMountainDesktop.Views.FusedDesktopComponentLibraryWindow"
         Width="860" Height="620"
         MinWidth="600" MinHeight="500"
+        CanResize="True"
         WindowStartupLocation="CenterScreen"
-        SystemDecorations="Full"
+        SystemDecorations="BorderOnly"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"
-        ExtendClientAreaTitleBarHeightHint="-1"
+        ExtendClientAreaTitleBarHeightHint="48"
         Background="Transparent"
-        TransparencyLevelHint="Mica"
         Title="添加小组件">
 
-    <Panel>
-        <!-- 背景磨砂效果 -->
-        <Border Background="{DynamicResource AdaptiveSurfaceLowBrush}"
-                Opacity="0.85" />
+    <Grid x:Name="RootGrid"
+          Classes="settings-scope"
+          Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
+          RowDefinitions="Auto,*">
+        <!-- 自定义标题栏 - 与 SettingsWindow 风格一致 -->
+        <Border x:Name="WindowTitleBarHost"
+                Height="48"
+                Padding="12,0,12,0"
+                Background="{DynamicResource AdaptiveSettingsWindowBackgroundBrush}"
+                BorderBrush="{DynamicResource AdaptiveSettingsWindowBorderBrush}"
+                BorderThickness="0,0,0,1"
+                PointerPressed="OnWindowTitleBarPointerPressed">
+            <Grid ColumnDefinitions="Auto,Auto,*,Auto"
+                  ColumnSpacing="8"
+                  VerticalAlignment="Center">
+                <fi:FluentIcon x:Name="WindowBrandIcon"
+                               Icon="Apps"
+                               IconVariant="Filled"
+                               FontSize="16"
+                               IsHitTestVisible="False"
+                               VerticalAlignment="Center" />
 
-        <Grid RowDefinitions="Auto,*,Auto">
-            <!-- 自定义标题栏 -->
-            <Border Background="Transparent"
-                    IsHitTestVisible="True"
-                    Padding="20,16">
-                <Grid ColumnDefinitions="*,Auto">
-                    <StackPanel Spacing="6" VerticalAlignment="Center">
-                        <TextBlock Text="添加小组件"
-                                   FontWeight="SemiBold"
-                                   FontSize="20"
-                                   Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
-                        <TextBlock Text="将精美组件放置在您的系统桌面上（负一屏）"
-                                   Opacity="0.6"
-                                   FontSize="13"
-                                   Foreground="{DynamicResource AdaptiveTextPrimaryBrush}" />
-                    </StackPanel>
+                <TextBlock x:Name="WindowTitleTextBlock"
+                           Grid.Column="1"
+                           FontSize="12"
+                           FontWeight="SemiBold"
+                           IsHitTestVisible="False"
+                           Text="添加小组件" />
 
-                    <Button Grid.Column="1"
-                            Width="36" Height="36"
-                            Padding="0"
-                            CornerRadius="{DynamicResource DesignCornerRadiusSm}"
-                            BorderThickness="0"
-                            Click="OnCloseClick">
-                        <fi:SymbolIcon Symbol="Dismiss" FontSize="18" />
-                    </Button>
-                </Grid>
-            </Border>
+                <TextBlock Grid.Column="2"
+                           FontSize="12"
+                           Opacity="0.6"
+                           IsHitTestVisible="False"
+                           VerticalAlignment="Center"
+                           Text="将精美组件放置在您的系统桌面上（负一屏）" />
 
-            <!-- 组件库控件 -->
-            <controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
-                                                          Grid.Row="1" />
-
-            <!-- 底部查找更多组件链接 -->
-            <Border Grid.Row="2"
-                    Background="Transparent"
-                    Padding="20,12">
-                <Button Classes="hyperlink"
-                        HorizontalAlignment="Center"
-                        Click="OnFindMoreComponentsClick">
-                    <StackPanel Orientation="Horizontal" Spacing="4">
-                        <fi:SymbolIcon Symbol="Globe" FontSize="14" />
-                        <TextBlock Text="查找更多组件" />
-                    </StackPanel>
+                <Button x:Name="CloseWindowButton"
+                        Grid.Column="3"
+                        Width="40"
+                        Height="32"
+                        Padding="0"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Click="OnCloseClick">
+                    <fi:FluentIcon Icon="Dismiss"
+                                   IconVariant="Regular"
+                                   FontSize="16" />
                 </Button>
-            </Border>
-        </Grid>
-    </Panel>
+            </Grid>
+        </Border>
+
+        <!-- 组件库控件 -->
+        <controls:FusedDesktopComponentLibraryControl x:Name="LibraryControl"
+                                                      Grid.Row="1"
+                                                      Margin="12,8,16,8" />
+    </Grid>
 </Window>

LanMountainDesktop/Views/FusedDesktopComponentLibraryWindow.axaml.cs

@@ -1,6 +1,7 @@
 using System;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using LanMountainDesktop.ComponentSystem;
 using LanMountainDesktop.Services;
@@ -103,23 +104,11 @@ public partial class FusedDesktopComponentLibraryWindow : Window
         Close();
     }
 
-    /// <summary>
-    /// 查找更多组件链接点击处理 - 打开设置窗口的插件目录页面
-    /// </summary>
-    private void OnFindMoreComponentsClick(object? sender, RoutedEventArgs e)
+    private void OnWindowTitleBarPointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        // 关闭当前窗口
-        Close();
-
-        // 打开设置窗口并导航到插件目录页面
-        if (Application.Current is App app && app.SettingsWindowService is { } settingsWindowService)
+        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
         {
-            var mainWindow = (Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.MainWindow as MainWindow;
-            var request = new SettingsWindowOpenRequest(
-                Source: "FusedDesktopComponentLibrary",
-                Owner: mainWindow,
-                PageId: "plugin-catalog");
-            settingsWindowService.Open(request);
+            BeginMoveDrag(e);
         }
     }