From 25c97052c68cd036f2cab6ff4728f7981a801deb Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Mon, 6 Mar 2023 18:51:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E8=BF=9E=E6=8E=A5=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/SettingsViewModel.cs       |  7 ++++++
 .../ConnectSettingsUserControl.xaml           | 25 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index d918eeb798..5575bda91c 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -23,6 +23,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Interop;
 using IWshRuntimeLibrary;
 using MaaWpfGui.Helper;
@@ -1805,6 +1806,12 @@ namespace MaaWpfGui
             }
         }
 
+        public void RemoveAddress_Click(string address)
+        {
+            ConnectAddressHistory.Remove(address);
+            ViewStatusStorage.Set("Connect.AddressHistory", JsonConvert.SerializeObject(ConnectAddressHistory));
+        }
+
         private string _adbPath = ViewStatusStorage.Get("Connect.AdbPath", string.Empty);
 
         /// <summary>
diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
index 1b8672699f..040bf87ed3 100644
--- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
@@ -92,7 +92,30 @@
             IsEnabled="{c:Binding !AutoDetectConnection}"
             ItemsSource="{Binding ConnectAddressHistory}"
             Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
-            ToolTip="{DynamicResource ConnectionAddressTip}" />
+            ToolTip="{DynamicResource ConnectionAddressTip}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid Width="{c:Binding ActualWidth - 20, RelativeSource={RelativeSource AncestorType=ComboBox}}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            Grid.Column="0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding}" />
+                        <Button
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            Command="{s:Action RemoveAddress_Click}"
+                            CommandParameter="{Binding}"
+                            Content="×"
+                            FontWeight="Bold" />
+                    </Grid>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
 
         <maa:TextBlock
             Grid.Row="3"