From 2aa92b0c1d1b4ed7a8d17fded8f6a0806dd80727 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Wed, 13 May 2026 23:56:58 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=20=E5=B0=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7-=E4=BE=BF=E6=8D=B7=E4=BB=BB=E5=8A=A1=20=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/TaskQueueViewModel.cs       |  2 +-
 .../ViewModels/UI/ToolboxViewModel.cs         | 36 ++-----------------
 src/MaaWpfGui/Views/UI/ToolboxView.xaml       | 23 ++++++------
 3 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 24b1343b0f..2d1892b1e6 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1254,7 +1254,7 @@ public class TaskQueueViewModel : Screen
     /// <summary>
     /// Clears log.
     /// </summary>
-    private void ClearLog()
+    public void ClearLog()
     {
         Execute.OnUIThread(() => {
             LogItemViewModels.Clear();
diff --git a/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs b/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
index 5e0852ebd0..4d1f3adc9d 100644
--- a/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
@@ -20,7 +20,6 @@ using System.Collections.Specialized;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -2104,7 +2103,6 @@ public class ToolboxViewModel : Screen
             }
 
             MiniGameTaskName = value.Value;
-            ClearMiniGameLogs();
         }
     }
 
@@ -2263,35 +2261,6 @@ public class ToolboxViewModel : Screen
         }
     }
 
-    public class MiniGameLogItem : PropertyChangedBase
-    {
-        public string Time { get; set; } = string.Empty;
-
-        public string Content { get; set; } = string.Empty;
-
-        public string Color { get; set; } = UiLogColor.Info;
-    }
-
-    public ObservableCollection<MiniGameLogItem> MiniGameLogs { get; } = [];
-
-    public void AddMiniGameLog(string content, string color = UiLogColor.Info)
-    {
-        Execute.OnUIThread(() =>
-        {
-            MiniGameLogs.Add(new MiniGameLogItem
-            {
-                Time = DateTime.Now.ToString("HH:mm:ss"),
-                Content = content,
-                Color = color,
-            });
-        });
-    }
-
-    public void ClearMiniGameLogs()
-    {
-        Execute.OnUIThread(() => MiniGameLogs.Clear());
-    }
-
     public void StartMiniGame()
     {
         _ = StartMiniGameAsync();
@@ -2305,15 +2274,14 @@ public class ToolboxViewModel : Screen
             return;
         }
 
+        Instances.TaskQueueViewModel.ClearLog();
+
         _runningState.SetIdle(false);
 
-        ClearMiniGameLogs();
-        AddMiniGameLog(LocalizationHelper.GetString("ConnectingToEmulator"), UiLogColor.Message);
         string errMsg = string.Empty;
         bool caught = await Task.Run(() => Instances.AsstProxy.AsstConnect(ref errMsg));
         if (!caught)
         {
-            AddMiniGameLog(errMsg, UiLogColor.Error);
             _runningState.SetIdle(true);
             return;
         }
diff --git a/src/MaaWpfGui/Views/UI/ToolboxView.xaml b/src/MaaWpfGui/Views/UI/ToolboxView.xaml
index a01ba72752..d9bf7f21da 100644
--- a/src/MaaWpfGui/Views/UI/ToolboxView.xaml
+++ b/src/MaaWpfGui/Views/UI/ToolboxView.xaml
@@ -831,8 +831,8 @@
         <TabItem Header="{DynamicResource MiniGame}">
             <Grid Margin="20,0,20,20">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200" />
-                    <ColumnDefinition Width="300" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" Margin="10">
@@ -849,6 +849,8 @@
                     </Grid.Resources>
                     <Border
                         Grid.Row="0"
+                        Width="210"
+                        MaxWidth="210"
                         Background="{DynamicResource RegionBrushOpacity25}"
                         BorderBrush="{DynamicResource BorderBrush}"
                         BorderThickness="1"
@@ -865,7 +867,6 @@
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <TextBlock
-                                        Margin="5,0"
                                         Text="{Binding Display}"
                                         TextTrimming="CharacterEllipsis" />
                                 </DataTemplate>
@@ -875,7 +876,7 @@
                                     <GroupStyle.HeaderTemplate>
                                         <DataTemplate>
                                             <Border
-                                                Padding="8,4"
+                                                Padding="0,4"
                                                 Background="{DynamicResource RegionBrushOpacity50}"
                                                 BorderBrush="{DynamicResource BorderBrush}"
                                                 BorderThickness="0,0,0,1">
@@ -889,18 +890,17 @@
                     </Border>
                     <Button
                         Grid.Row="1"
-                        Width="160"
-                        Height="60"
-                        Margin="0,20,0,0"
+                        Width="100"
+                        Height="50"
+                        Margin="0,10,0,0"
                         HorizontalAlignment="Center"
                         Command="{s:Action StartMiniGame}"
                         Content="{c:Binding 'Idle ? &quot;Link Start!&quot; : &quot;Stop!&quot;'}"
                         IsEnabled="{c:Binding 'Inited and !Stopping'}" />
                 </Grid>
-                <Grid Grid.Column="1" Margin="50,50,30,10" IsEnabled="{Binding Idle}" VerticalAlignment="Top">
+                <Grid Grid.Column="1" Margin="10" IsEnabled="{Binding Idle}" VerticalAlignment="Top">
                     <Grid Visibility="{c:Binding 'SelectedMiniGameItem != null'}">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
@@ -924,8 +924,9 @@
                                 SelectedValuePath="Value" />
                         </Grid>
                         <controls:TextBlock
+                            VerticalAlignment="Top"
                             Grid.Row="1"
-                            Margin="10,0,10,10"
+                            Margin="10"
                             Text="{Binding MiniGameTip}"
                             TextWrapping="Wrap" />
                     </Grid>
@@ -950,7 +951,7 @@
                             <ItemsControl
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Stretch"
-                                ItemsSource="{Binding MiniGameLogs}">
+                                ItemsSource="{Binding LogItemViewModels, Source={x:Static helper:Instances.TaskQueueViewModel}}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>