From 886a4785a087b41381fe005f655d974c388889b3 Mon Sep 17 00:00:00 2001
From: MakesYT <42534870+MakesYT@users.noreply.github.com>
Date: Sun, 26 May 2024 21:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=A7=E9=87=8F?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=94=99=E8=AF=AF=E6=A0=B7=E5=BC=8F=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=90=9C=E7=B4=A2=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 KitopiaAvalonia/App.axaml.cs                  |  3 +-
 .../Converter/ControlContentSize.cs           | 22 +++++++
 KitopiaAvalonia/KitopiaAvalonia.csproj        |  4 +-
 .../Pages/CustomScenariosManagerPage.axaml    | 13 ++--
 KitopiaAvalonia/Pages/HotKeyManagerPage.axaml | 63 ++++++++++---------
 KitopiaAvalonia/Pages/PluginManagerPage.axaml | 51 +++++++--------
 .../Pages/PluginSettingSelectPage.axaml       | 36 +++++------
 KitopiaAvalonia/Pages/SettingPage.axaml       | 13 ++--
 .../Windows/MouseQuickWindow.axaml            |  6 +-
 KitopiaAvalonia/Windows/SearchWindow.axaml    | 36 ++++++++---
 KitopiaAvalonia/Windows/SearchWindow.axaml.cs | 18 ++----
 11 files changed, 141 insertions(+), 124 deletions(-)
 create mode 100644 KitopiaAvalonia/Converter/ControlContentSize.cs

diff --git a/KitopiaAvalonia/App.axaml.cs b/KitopiaAvalonia/App.axaml.cs
index 456aa76..47237dc 100644
--- a/KitopiaAvalonia/App.axaml.cs
+++ b/KitopiaAvalonia/App.axaml.cs
@@ -13,6 +13,7 @@
 using Core.ViewModel.Pages.customScenario;
 using Core.ViewModel.Pages.plugin;
 using Core.ViewModel.TaskEditor;
+using HotAvalonia;
 using Kitopia.Services;
 using KitopiaAvalonia.Pages;
 using KitopiaAvalonia.Services;
@@ -33,7 +34,7 @@ public partial class App : Application
 
     public override void Initialize()
     {
-        //this.EnableHotReload();
+        this.EnableHotReload();
         AvaloniaXamlLoader.Load(this);
     }
 
diff --git a/KitopiaAvalonia/Converter/ControlContentSize.cs b/KitopiaAvalonia/Converter/ControlContentSize.cs
new file mode 100644
index 0000000..8c5390a
--- /dev/null
+++ b/KitopiaAvalonia/Converter/ControlContentSize.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Avalonia;
+using Avalonia.Data.Converters;
+
+namespace KitopiaAvalonia.Converter;
+
+public class ControlContentSize : IMultiValueConverter
+{
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+
+    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
+    {
+        var control = values[0] as double? ?? 0;
+        var parent = values[1] as Thickness? ?? new Thickness(0);
+        return control - parent.Left - parent.Right;
+    }
+}
\ No newline at end of file
diff --git a/KitopiaAvalonia/KitopiaAvalonia.csproj b/KitopiaAvalonia/KitopiaAvalonia.csproj
index 6679349..9bc45e2 100644
--- a/KitopiaAvalonia/KitopiaAvalonia.csproj
+++ b/KitopiaAvalonia/KitopiaAvalonia.csproj
@@ -53,8 +53,8 @@
     <ItemGroup>
         <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0-beta2"/>
-        <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.0" />
-        <PackageReference Include="HotAvalonia.Extensions" Version="1.1.0" PrivateAssets="All" />
+        <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1"/>
+        <PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All"/>
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
diff --git a/KitopiaAvalonia/Pages/CustomScenariosManagerPage.axaml b/KitopiaAvalonia/Pages/CustomScenariosManagerPage.axaml
index 8acb30d..7c510b0 100644
--- a/KitopiaAvalonia/Pages/CustomScenariosManagerPage.axaml
+++ b/KitopiaAvalonia/Pages/CustomScenariosManagerPage.axaml
@@ -12,21 +12,20 @@
     <UserControl.Resources>
         <converter:ReverseBoolToVisibilityConverter x:Key="reverseBoolToVisibilityConverter" />
     </UserControl.Resources>
-    <StackPanel Margin="42">
+    <Grid RowDefinitions="Auto,Auto,*" Margin="42">
         <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="情景列表">
             <TextBlock.Foreground>
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
             </TextBlock.Foreground>
         </TextBlock>
-        <StackPanel Orientation="Horizontal">
+        <StackPanel Grid.Row="1" Orientation="Horizontal">
             <Button Content="新建情景" Command="{Binding NewCustomScenariosCommand}" />
         </StackPanel>
-        <ListBox Classes="draggableVirtualizing"
+        <ListBox Grid.Row="2" Classes="draggableVirtualizing"
                  ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                 MaxHeight="385"
+
                  ItemsSource="{Binding CustomScenarios,Mode=OneWay}"
                  Margin="0,10,0,0">
-
             <ListBox.ItemContainerTheme>
                 <ControlTheme TargetType="ListBoxItem">
                     <Setter Property="Template">
@@ -118,5 +117,7 @@
 
 
         </ListBox>
-    </StackPanel>
+
+
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Pages/HotKeyManagerPage.axaml b/KitopiaAvalonia/Pages/HotKeyManagerPage.axaml
index 9a7dca5..d659253 100644
--- a/KitopiaAvalonia/Pages/HotKeyManagerPage.axaml
+++ b/KitopiaAvalonia/Pages/HotKeyManagerPage.axaml
@@ -12,39 +12,44 @@
     <UserControl.Resources>
         <converter:HotKeySignNameToStringCtr x:Key="HotKeySignNameToStringCtr" />
     </UserControl.Resources>
-    <StackPanel Margin="42">
+    <Grid RowDefinitions="Auto,*" Margin="42">
         <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="快捷键列表">
             <TextBlock.Foreground>
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
             </TextBlock.Foreground>
         </TextBlock>
+        <ScrollViewer Grid.Row="1">
+            <ItemsControl
 
-        <ItemsControl
-            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-            MaxHeight="385"
-            Margin="0,10,0,0" ItemsSource="{Binding Source={x:Static hotkey:HotKeyManager.HotKeys}}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate x:DataType="hotkey:HotKeyModel">
-                    <Border BorderBrush="LightGray" BorderThickness="1" CornerRadius="4">
-                        <StackPanel HorizontalAlignment="Center" Margin="5,0,5,5">
-                            <TextBlock Margin="0,5,0,0" Foreground="{DynamicResource TextFillColorPrimaryBrush}"
-                                       Text="{Binding SignName,Converter={StaticResource HotKeySignNameToStringCtr}}" />
-                            <controls1:HotKeyShow Margin="0,5,0,0"
-                                                  HotKeyModel="{Binding RelativeSource={RelativeSource AncestorType=StackPanel},Path=DataContext}" />
-                        </StackPanel>
-
-                    </Border>
-
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-
-        </ItemsControl>
-
-
-    </StackPanel>
+                Margin="0,10,0,0" ItemsSource="{Binding Source={x:Static hotkey:HotKeyManager.HotKeys}}">
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate x:DataType="hotkey:HotKeyModel">
+                        <Border BorderBrush="LightGray" BorderThickness="1" CornerRadius="4">
+                            <StackPanel HorizontalAlignment="Center" Margin="5,0,5,5">
+                                <TextBlock Margin="0,5,0,0" Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+                                           Text="{Binding SignName,Converter={StaticResource HotKeySignNameToStringCtr}}" />
+                                <controls1:HotKeyShow Margin="0,5,0,0"
+                                                      HotKeyModel="{Binding RelativeSource={RelativeSource AncestorType=StackPanel},Path=DataContext}" />
+                            </StackPanel>
+
+                        </Border>
+
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+
+                        <WrapPanel ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                   ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                   ScrollViewer.AllowAutoHide="True">
+
+                        </WrapPanel>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+
+            </ItemsControl>
+        </ScrollViewer>
+
+
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Pages/PluginManagerPage.axaml b/KitopiaAvalonia/Pages/PluginManagerPage.axaml
index f99e81f..af0063b 100644
--- a/KitopiaAvalonia/Pages/PluginManagerPage.axaml
+++ b/KitopiaAvalonia/Pages/PluginManagerPage.axaml
@@ -3,34 +3,26 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:converter="clr-namespace:Kitopia.Converter"
-             xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
-             xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
-             xmlns:customScenario="clr-namespace:Core.ViewModel.Pages.customScenario;assembly=Core"
-             xmlns:customScenario1="clr-namespace:Core.SDKs.CustomScenario;assembly=Core"
-             xmlns:av="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:config="clr-namespace:Core.SDKs.Services.Config;assembly=Core"
              xmlns:plugin="clr-namespace:Core.ViewModel.Pages.plugin;assembly=Core"
              xmlns:plugin1="clr-namespace:Kitopia.View.Pages.Plugin"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="plugin:PluginManagerPageViewModel"
              x:Class="KitopiaAvalonia.Pages.PluginManagerPage">
-    
+
     <UserControl.Resources>
         <plugin1:PluginInfoToInfo x:Key="PluginInfoToInfo" />
-        
+
     </UserControl.Resources>
-    <StackPanel Margin="42">
+    <Grid RowDefinitions="Auto,*" Margin="42">
         <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="插件列表">
             <TextBlock.Foreground>
                 <SolidColorBrush Color="{DynamicResource TextFillColorPrimary}" />
             </TextBlock.Foreground>
         </TextBlock>
-        <ListBox
-            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-            MaxHeight="385" 
-            ItemsSource="{Binding Items}"
-            Margin="0,10,0,0">
+        <ListBox Grid.Row="1"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 ItemsSource="{Binding Items}"
+                 Margin="0,10,0,0">
             <ListBox.ItemContainerTheme>
                 <ControlTheme TargetType="ListBoxItem">
                     <Setter Property="Template">
@@ -52,17 +44,16 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Button HorizontalAlignment="Stretch" x:Name="Button"
-                               Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).ToPluginSettingPageCommand}"
-                               CommandParameter="{Binding }"
-                               Background="Transparent"
-                               Height="72" Margin="0"
-                               Padding="3">
+                            Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).ToPluginSettingPageCommand}"
+                            CommandParameter="{Binding }"
+                            Background="Transparent"
+                            Height="72" Margin="0"
+                            Padding="3">
 
                         <Grid VerticalAlignment="Center"
                               Width="{Binding Path=$parent.Bounds.Width}" ColumnDefinitions="80,*,*,Auto,Auto">
                             <Image Grid.Column="0" HorizontalAlignment="Left" Focusable="False" Width="48"
-                                   Height="48" Margin="0,0,12,0"
-                            />
+                                   Height="48" Margin="0,0,12,0" />
                             <StackPanel Grid.Column="1" Margin="5" VerticalAlignment="Center"
                                         HorizontalAlignment="Stretch">
                                 <TextBlock VerticalAlignment="Center" Margin="0" Focusable="False"
@@ -74,12 +65,12 @@
                                            Text="{Binding Path=.,Converter={StaticResource PluginInfoToInfo }}" />
                             </StackPanel>
                             <ScrollViewer IsHitTestVisible="False" Grid.Column="2" Height="60"
-                                                    VerticalAlignment="Center"
-                                                    HorizontalScrollBarVisibility="Hidden">
+                                          VerticalAlignment="Center"
+                                          HorizontalScrollBarVisibility="Hidden">
                                 <TextBlock VerticalAlignment="Center"
-                                              MaxWidth="{Binding $parent.Bounds.Width}"
-                                              TextWrapping="Wrap"
-                                              Text="{Binding Description}" />
+                                           MaxWidth="{Binding $parent.Bounds.Width}"
+                                           TextWrapping="Wrap"
+                                           Text="{Binding Description}" />
                             </ScrollViewer>
 
                             <ToggleSwitch
@@ -88,8 +79,8 @@
                                 Command="{Binding Path=$parent[ListBox].((plugin:PluginManagerPageViewModel)DataContext).SwitchCommand}"
                                 CommandParameter="{Binding}" />
                             <controls:SymbolIcon Grid.Column="4" Symbol="ChevronRight" FontSize="20"
-                                           IsVisible="{Binding IsEnabled}"
-                                           Margin="0,0,10,0" />
+                                                 IsVisible="{Binding IsEnabled}"
+                                                 Margin="0,0,10,0" />
                         </Grid>
 
 
@@ -100,5 +91,5 @@
 
         </ListBox>
 
-    </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Pages/PluginSettingSelectPage.axaml b/KitopiaAvalonia/Pages/PluginSettingSelectPage.axaml
index 4c7ef08..5d0df1c 100644
--- a/KitopiaAvalonia/Pages/PluginSettingSelectPage.axaml
+++ b/KitopiaAvalonia/Pages/PluginSettingSelectPage.axaml
@@ -3,28 +3,20 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:converter="clr-namespace:Kitopia.Converter"
-             xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
-             xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
-             xmlns:customScenario="clr-namespace:Core.ViewModel.Pages.customScenario;assembly=Core"
-             xmlns:customScenario1="clr-namespace:Core.SDKs.CustomScenario;assembly=Core"
-             xmlns:av="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:config="clr-namespace:Core.SDKs.Services.Config;assembly=Core"
              xmlns:plugin="clr-namespace:Core.ViewModel.Pages.plugin;assembly=Core"
-             xmlns:plugin1="clr-namespace:Kitopia.View.Pages.Plugin"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="plugin:PluginSettingViewModel"
              x:Class="KitopiaAvalonia.Pages.PluginSettingSelectPage">
     <UserControl.Resources>
-        
+
     </UserControl.Resources>
-    <StackPanel Margin="42">
+    <Grid RowDefinitions="Auto,*" Margin="42">
         <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Text="{Binding PluginName}" />
-        <ListBox
-            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-            MaxHeight="385" 
-            ItemsSource="{Binding SettingItems}"
-            Margin="0,10,0,0">
+        <ListBox Grid.Row="1"
+                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                 MaxHeight="385"
+                 ItemsSource="{Binding SettingItems}"
+                 Margin="0,10,0,0">
             <ListBox.ItemContainerTheme>
                 <ControlTheme TargetType="ListBoxItem">
                     <Setter Property="Template">
@@ -46,17 +38,17 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Button HorizontalAlignment="Stretch" x:Name="Button"
-                               Command="{Binding Path=$parent[ListBox].((plugin:PluginSettingViewModel)DataContext).NavigateCommand}"
-                               CommandParameter="{Binding Key }"
-                               Background="Transparent"
-                               Height="72" Margin="0"
-                               Padding="3">
+                            Command="{Binding Path=$parent[ListBox].((plugin:PluginSettingViewModel)DataContext).NavigateCommand}"
+                            CommandParameter="{Binding Key }"
+                            Background="Transparent"
+                            Height="72" Margin="0"
+                            Padding="3">
 
                         <Grid VerticalAlignment="Center"
                               Width="{Binding Path=$parent.Bounds.Width}" ColumnDefinitions="80,*,*,Auto,Auto">
                             <TextBlock Grid.Column="1" Text="{Binding Title}" FontSize="18" />
                             <controls:SymbolIcon Grid.Column="4" Symbol="ChevronRight" FontSize="20"
-                                           Margin="0,0,10,0" />
+                                                 Margin="0,0,10,0" />
                         </Grid>
 
 
@@ -66,5 +58,5 @@
 
 
         </ListBox>
-    </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Pages/SettingPage.axaml b/KitopiaAvalonia/Pages/SettingPage.axaml
index b6c9c30..ec4aa0b 100644
--- a/KitopiaAvalonia/Pages/SettingPage.axaml
+++ b/KitopiaAvalonia/Pages/SettingPage.axaml
@@ -2,25 +2,22 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:converter="clr-namespace:Kitopia.Converter"
              xmlns:pages="clr-namespace:Core.ViewModel.Pages;assembly=Core"
-             xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="pages:SettingPageViewModel"
              x:Class="KitopiaAvalonia.Pages.SettingPage">
     <UserControl.Resources>
         <converter:HotKeySignNameToolCTr x:Key="HotKeySignNameToolCTr" />
     </UserControl.Resources>
-    <ScrollViewer>
-        <StackPanel Margin="42">
-            <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Name="TextBlock" />
-            <StackPanel Name="StackPanel">
+
+    <Grid RowDefinitions="Auto,*" Margin="42">
+        <TextBlock Margin="0" FontSize="18" FontWeight="DemiBold" Name="TextBlock" />
+        <StackPanel Grid.Row="1" Name="StackPanel">
 
 
-            </StackPanel>
         </StackPanel>
+    </Grid>
 
-    </ScrollViewer>
 
 </UserControl>
\ No newline at end of file
diff --git a/KitopiaAvalonia/Windows/MouseQuickWindow.axaml b/KitopiaAvalonia/Windows/MouseQuickWindow.axaml
index 5be16e3..78a75dd 100644
--- a/KitopiaAvalonia/Windows/MouseQuickWindow.axaml
+++ b/KitopiaAvalonia/Windows/MouseQuickWindow.axaml
@@ -30,11 +30,7 @@
         <searchWindow:SymbolToVisible x:Key="SymbolToVisible" />
         <converter:IntToIconSymbol x:Key="IntToIconSymbol" />
     </Window.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+    <Grid RowDefinitions="Auto,*">
         <TextBlock Grid.Row="0" Text="{Binding SelectedItem,Converter={StaticResource MouseQuickSelectedItem}}"
                    TextWrapping="Wrap" FontSize="20" Margin="10,10,10,10" />
 
diff --git a/KitopiaAvalonia/Windows/SearchWindow.axaml b/KitopiaAvalonia/Windows/SearchWindow.axaml
index ce4bbe3..6815598 100644
--- a/KitopiaAvalonia/Windows/SearchWindow.axaml
+++ b/KitopiaAvalonia/Windows/SearchWindow.axaml
@@ -9,6 +9,7 @@
                      xmlns:converter="clr-namespace:Kitopia.Converter"
                      xmlns:controls1="clr-namespace:KitopiaAvalonia.Controls"
                      xmlns:pluginCore="clr-namespace:PluginCore;assembly=PluginCore"
+                     xmlns:converter1="clr-namespace:KitopiaAvalonia.Converter"
                      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                      x:Class="KitopiaAvalonia.Windows.SearchWindow"
                      x:DataType="viewModel:SearchWindowViewModel"
@@ -35,6 +36,7 @@
         <converter:IntToIconSymbol x:Key="IntToIconSymbol" />
         <searchWindow:SymbolToVisible x:Key="SymbolToVisible" />
         <searchWindow:ItemNameMatchCtr x:Key="ItemNameMatchCtr" />
+        <converter1:ControlContentSize x:Key="ControlContentSize" />
     </windowing:AppWindow.Resources>
     <Panel>
         <Panel.Background>
@@ -61,10 +63,12 @@
                      ItemsSource="{Binding Items,Mode=OneWay }"
                      KeyDown="DataGrid_OnKeyDown"
                      PointerMoved="DataGrid_OnPointerMoved"
+
                      Margin="0,0,0,0">
                 <ListBox.Resources>
                     <SolidColorBrush x:Key="Brush" Color="LightGray" Opacity="0.15" />
                 </ListBox.Resources>
+
                 <ListBox.Styles>
                     <Style
                         Selector="ListBoxItem:selected > Button#Item /template/ ContentPresenter#PART_ContentPresenter">
@@ -72,11 +76,12 @@
                     </Style>
 
                     <Style Selector="ListBoxItem">
-
+                        <Setter Property="Padding" Value="0,3,0,3"></Setter>
                         <Setter Property="Template">
                             <ControlTemplate x:DataType="pluginCore:SearchViewItem">
 
                                 <Button ToolTip.Tip="{Binding Path=. ,Converter={StaticResource SearchItemToInfo}}"
+                                        HorizontalAlignment="Stretch"
                                         IsTabStop="True"
                                         Name="Item"
                                         Command="{Binding  $parent[ListBox].((viewModel:SearchWindowViewModel)DataContext).OpenFileCommand}"
@@ -100,13 +105,25 @@
                                         </MenuFlyout>
 
                                     </Button.ContextFlyout>
-                                    <Grid HorizontalAlignment="Left" Margin="5,0,0,0">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="30" />
-                                            <ColumnDefinition Width="48" />
-                                            <ColumnDefinition Width="455 " />
-                                            <ColumnDefinition Width="195" />
-                                        </Grid.ColumnDefinitions>
+                                    <Grid HorizontalAlignment="Stretch"
+                                          ColumnDefinitions="Auto,Auto,* ,Auto">
+                                        <Grid.Width>
+                                            <MultiBinding Converter="{StaticResource ControlContentSize}">
+                                                <MultiBinding.Bindings>
+                                                    <Binding
+                                                        RelativeSource="{RelativeSource AncestorType=ContentPresenter, Tree=Visual}"
+                                                        Path="Bounds.Width">
+                                                    </Binding>
+                                                    <Binding
+                                                        RelativeSource="{RelativeSource AncestorType=ContentPresenter, Tree=Visual}"
+                                                        Path="Padding">
+                                                    </Binding>
+
+                                                </MultiBinding.Bindings>
+                                            </MultiBinding>
+
+
+                                        </Grid.Width>
                                         <Panel Width="28">
                                             <controls1:PinButton KeyboardNavigation.TabNavigation="None" FontSize="26"
                                                                  IsVisible="{Binding Path=FileType, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter='Pin'}"
@@ -126,7 +143,8 @@
                                                            Glyph="{Binding IconSymbol,Converter={StaticResource IntToIconSymbol}}" />
 
 
-                                        <StackPanel Grid.Column="2" Margin="5" VerticalAlignment="Top">
+                                        <StackPanel Grid.Column="2" Margin="5" VerticalAlignment="Top"
+                                                    HorizontalAlignment="Stretch">
                                             <TextBlock VerticalAlignment="Center" Margin="0" Focusable="False"
                                                        FontFamily="HarmonyOS Sans"
                                                        Inlines="{Binding Path=., 
diff --git a/KitopiaAvalonia/Windows/SearchWindow.axaml.cs b/KitopiaAvalonia/Windows/SearchWindow.axaml.cs
index da213c2..60b8397 100644
--- a/KitopiaAvalonia/Windows/SearchWindow.axaml.cs
+++ b/KitopiaAvalonia/Windows/SearchWindow.axaml.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
@@ -23,13 +22,8 @@ public SearchWindow()
     {
         InitializeComponent();
         RenderOptions.SetTextRenderingMode(this, TextRenderingMode.Antialias);
-        WeakReferenceMessenger.Default.Register<string, string>(this, "SearchWindowClose", (_, _) =>
-        {
-            Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                IsVisible = false;
-            });
-        });
+        WeakReferenceMessenger.Default.Register<string, string>(this, "SearchWindowClose",
+            (_, _) => { Dispatcher.UIThread.InvokeAsync(() => { IsVisible = false; }); });
     }
 
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
@@ -51,7 +45,6 @@ private void w_Deactivated(object? sender, EventArgs eventArgs)
     private void w_Activated(object sender, EventArgs e)
     {
         this.Focus();
-        
     }
 
     private void tx_KeyDown(object? sender, KeyEventArgs e)
@@ -65,7 +58,6 @@ private void tx_KeyDown(object? sender, KeyEventArgs e)
             }
 
             e.Handled = true;
-            return;
         }
         else if (e.Key == Key.Down)
         {
@@ -87,7 +79,8 @@ private void DataGrid_OnKeyDown(object? sender, KeyEventArgs e)
         if (e.Key == Key.Up)
         {
             var realizedContainers = dataGrid.GetRealizedContainers();
-            if (realizedContainers.First().DataContext == dataGrid.SelectedItem)
+            if (realizedContainers.First()
+                                  .DataContext == dataGrid.SelectedItem)
             {
                 tx.Focus();
             }
@@ -111,7 +104,8 @@ private void DataGrid_OnKeyDown(object? sender, KeyEventArgs e)
 
     private void DataGrid_OnPointerMoved(object? sender, PointerEventArgs e)
     {
-        var listBoxItem = dataGrid.GetVisualAt<ListBoxItem>(e.GetCurrentPoint(dataGrid).Position);
+        var listBoxItem = dataGrid.GetVisualAt<ListBoxItem>(e.GetCurrentPoint(dataGrid)
+                                                             .Position);
         if (listBoxItem != null)
         {
             listBoxItem.IsSelected = true;