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

chore: gpu 选项禁用滚轮切换

Browse Source 
fix #12210
This commit is contained in:
uye
2025-03-31 00:51:03 +08:00
parent acd8afd3b5
commit 443c9a74ff
6 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MaaWpfGui/Helper/MouseWheelHelper.cs
View File

@@ -6,7 +6,7 @@ namespace MaaWpfGui.Helper
{
public static class MouseWheelHelper
{
public static void HandlePreviewMouseWheel(object sender, MouseWheelEventArgs e)
public static void RouteMouseWheelToParent(object sender, MouseWheelEventArgs e)
{
if (e.Handled)
{
@@ -21,5 +21,13 @@ namespace MaaWpfGui.Helper
var parent = ((Control)sender).Parent as UIElement;
parent?.RaiseEvent(eventArg);
}
public static void DisableComboBoxScrollWhenClosed(object sender, MouseWheelEventArgs e)
{
if (sender is ComboBox { IsDropDownOpen: false })
{
e.Handled = true; // 阻止滚动
}
}
}
}

2
src/MaaWpfGui/Views/UI/AnnouncementView.xaml
View File

@@ -72,7 +72,7 @@
d:Markdown="#Test
This is a test text.

~~This is a test text~~

*This is a test text*

**This is a test text**"
ClickAction="SafetyOpenBrowser"
Markdown="{Binding SelectedAnnouncementSection.Content}"
PreviewMouseWheel="{s:Action HandlePreviewMouseWheel,
PreviewMouseWheel="{s:Action RouteMouseWheelToParent,
Target={x:Type helper:MouseWheelHelper}}">
<mdxam:MarkdownScrollViewer.MarkdownStyle>
<StaticResource ResourceKey="MdXamlStyle" />

4
src/MaaWpfGui/Views/UI/RecognizerView.xaml
View File

@@ -222,7 +222,7 @@
HeadersVisibility="None"
IsReadOnly="True"
ItemsSource="{Binding OperBoxNotHaveList}"
PreviewMouseWheel="{s:Action HandlePreviewMouseWheel,
PreviewMouseWheel="{s:Action RouteMouseWheelToParent,
Target={x:Type helper:MouseWheelHelper}}"
ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
@@ -253,7 +253,7 @@
HeadersVisibility="None"
IsReadOnly="True"
ItemsSource="{Binding OperBoxHaveList}"
PreviewMouseWheel="{s:Action HandlePreviewMouseWheel,
PreviewMouseWheel="{s:Action RouteMouseWheelToParent,
Target={x:Type helper:MouseWheelHelper}}"
ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"

2
src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
View File

@@ -52,7 +52,7 @@
Margin="10,10,10,0"
ClickAction="SafetyOpenBrowser"
Markdown="{Binding UpdateInfo}"
PreviewMouseWheel="{s:Action HandlePreviewMouseWheel,
PreviewMouseWheel="{s:Action RouteMouseWheelToParent,
Target={x:Type helper:MouseWheelHelper}}">
<mdxam:MarkdownScrollViewer.MarkdownStyle>
<StaticResource ResourceKey="MdXamlStyle" />

2
src/MaaWpfGui/Views/UserControl/Settings/PerformanceUserControl.xaml
View File

@@ -34,6 +34,8 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
ItemsSource="{Binding GpuOptions}"
PreviewMouseWheel="{s:Action DisableComboBoxScrollWhenClosed,
Target={x:Type helper:MouseWheelHelper}}"
SelectedValue="{Binding ActiveGpuOption}">
<hc:ComboBox.ItemContainerStyle>
<Style BasedOn="{StaticResource ComboBoxItemBaseStyle}" TargetType="ComboBoxItem">

2
src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
View File

@@ -125,7 +125,7 @@
dd:DragDrop.IsDragSource="True"
dd:DragDrop.IsDropTarget="True"
ItemsSource="{Binding Path=InfrastItemViewModels}"
PreviewMouseWheel="{s:Action HandlePreviewMouseWheel,
PreviewMouseWheel="{s:Action RouteMouseWheelToParent,
Target={x:Type helper:MouseWheelHelper}}"
ToolTip="{DynamicResource LabelSequenceTip}">
<ListBox.ItemTemplate>