fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 连接设置 数据绑定

Browse Source
This commit is contained in:
status102
2024-11-13 23:14:51 +08:00
parent 48430b6130
commit 5c1b6ef804
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MaaWpfGui/Views/UserControl/ConnectSettingsOnWakeUpUserControl.xaml
View File

@@ -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"