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

perf: 移除CheckBox右键额外调用 (#7537)

Browse Source 
perf: 移除CheckBox右键额外调用
This commit is contained in:
status102
2023-12-12 19:45:46 +08:00
committed by GitHub
parent da99c911b2 63ed62f6d4
commit 0cd9ff880e
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
View File

@@ -6,6 +6,7 @@
xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:helper="clr-namespace:MaaWpfGui.Helper"
xmlns:local="clr-namespace:MaaWpfGui"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:s="https://github.com/canton7/Stylet"
@@ -36,16 +37,19 @@
VerticalContentAlignment="Center"
Content="{DynamicResource UseSanityPotion}"
IsChecked="{Binding UseMedicineWithNull}"
MouseRightButtonDown="ToggleCheckBoxNullOnRightClick"
MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
Target={x:Type helper:CheckBoxHelper}}"
ToolTip="{DynamicResource CheckBoxesNotSavedAsNull}" />
<CheckBox
Height="30"
Margin="6"
VerticalContentAlignment="Center"
Click="ToggleCheckBoxNullOnLeftClick"
Click="{s:Action ToggleCheckBoxNullOnLeftClick,
Target={x:Type helper:CheckBoxHelper}}"
Content="{DynamicResource UseOriginitePrime}"
IsChecked="{Binding UseStoneWithNull}"
MouseRightButtonDown="ToggleCheckBoxNullOnRightClick"
MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
Target={x:Type helper:CheckBoxHelper}}"
ToolTip="{DynamicResource CheckBoxesNotSaved}" />
<CheckBox
Height="30"
@@ -53,7 +57,8 @@
VerticalContentAlignment="Center"
Content="{DynamicResource PerformBattles}"
IsChecked="{Binding HasTimesLimitedWithNull}"
MouseRightButtonDown="ToggleCheckBoxNullOnRightClick"
MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
Target={x:Type helper:CheckBoxHelper}}"
ToolTip="{DynamicResource CheckBoxesNotSavedAsNull}" />
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical">
@@ -104,7 +109,8 @@
VerticalContentAlignment="Center"
Content="{DynamicResource AssignedMaterial}"
IsChecked="{Binding IsSpecifiedDropsWithNull}"
MouseRightButtonDown="ToggleCheckBoxNullOnRightClick"
MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
Target={x:Type helper:CheckBoxHelper}}"
ToolTip="{DynamicResource NoAutoNavigation}" />
<Grid Height="42" Visibility="{c:Binding IsSpecifiedDropsWithNull}">
<controls:TextBlock

10
src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs
View File

@@ -39,15 +39,5 @@ namespace MaaWpfGui.Views.UserControl
{
_setText?.Invoke(sender, _paras);
}
private void ToggleCheckBoxNullOnRightClick(object sender, MouseButtonEventArgs e)
{
CheckBoxHelper.ToggleCheckBoxNullOnRightClick(sender, e);
}
private void ToggleCheckBoxNullOnLeftClick(object sender, RoutedEventArgs e)
{
CheckBoxHelper.ToggleCheckBoxNullOnLeftClick(sender, e);
}
}
}