From 5c1b6ef8048978ca3751c0fa7bb15cef1965cfec Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:14:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E6=95=B0=E6=8D=AE=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConnectSettingsOnWakeUpUserControl.xaml   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml
index 1a9106a835..11e2263713 100644
--- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml
@@ -10,6 +10,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
+    d:Background="White"
     d:DataContext="{d:DesignInstance {x:Type ui:SettingsViewModel}}"
     d:DesignWidth="220"
     mc:Ignorable="d">
@@ -38,16 +39,24 @@
 
         <CheckBox
             Margin="0,10"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
             Content="{DynamicResource AutoDetectConnection}"
+            DataContext="{Binding ConnectSettingsDataContext}"
             IsChecked="{Binding AutoDetectConnection}"
             ToolTip="{DynamicResource AutoDetectConnectionTip}" />
         <CheckBox
             Margin="0,10"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
             Content="{DynamicResource AlwaysAutoDetectConnection}"
+            DataContext="{Binding ConnectSettingsDataContext}"
             IsChecked="{Binding AlwaysAutoDetectConnection}"
             Visibility="{c:Binding AutoDetectConnection}" />
 
-        <Grid Margin="0,5" Visibility="{c:Binding !AutoDetectConnection}">
+        <Grid
+            Margin="0,5"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
+            DataContext="{Binding ConnectSettingsDataContext}"
+            Visibility="{c:Binding !AutoDetectConnection}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
@@ -71,6 +80,8 @@
             Margin="0,5"
             HorizontalContentAlignment="Stretch"
             hc:InfoElement.Title="{DynamicResource ConnectionAddress}"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
+            DataContext="{Binding ConnectSettingsDataContext}"
             IsEditable="True"
             ItemsSource="{Binding ConnectAddressHistory}"
             Style="{StaticResource ComboBoxExtend}"
@@ -103,6 +114,8 @@
         <ComboBox
             Margin="0,5"
             hc:InfoElement.Title="{DynamicResource ConnectionPreset}"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
+            DataContext="{Binding ConnectSettingsDataContext}"
             DisplayMemberPath="Display"
             ItemsSource="{Binding ConnectConfigList}"
             SelectedValue="{Binding ConnectConfig}"
@@ -112,8 +125,10 @@
         <ComboBox
             Margin="0,5"
             hc:InfoElement.Title="{DynamicResource TouchMode}"
+            s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}"
+            DataContext="{Binding ConnectSettingsDataContext}"
             DisplayMemberPath="Display"
-            IsHitTestVisible="{Binding Idle}"
+            IsHitTestVisible="{Binding DataContext.Idle, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
             ItemsSource="{Binding TouchModeList}"
             SelectedValue="{Binding TouchMode}"
             SelectedValuePath="Value"