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

fix: 修复仓库识别无法在表格框内滚动

Browse Source 
fix #5797
This commit is contained in:
uye
2023-09-02 21:06:54 +08:00
parent db8e6ac333
commit bba0727bbd
1 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,40 +181,38 @@
<TabItem Header="{DynamicResource DepotRecognition}">
<Grid Margin="20,0,20,20">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
<RowDefinition Height="150" />
</Grid.RowDefinitions>
<hc:ScrollViewer
Grid.Row="0"
Margin="10,0"
VerticalAlignment="Top"
IsInertiaEnabled="True">
<StackPanel>
<controls:TextBlock
Height="36"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Focusable="True"
FontSize="14"
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding DepotInfo}"
TextWrapping="Wrap" />
<DataGrid
Width="600"
HorizontalAlignment="Center"
IsReadOnly="True"
ItemsSource="{Binding DepotResult}">
<DataGrid.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="3" />
</ItemsPanelTemplate>
</DataGrid.ItemsPanel>
</DataGrid>
</StackPanel>
</hc:ScrollViewer>
<StackPanel
<StackPanel>
<controls:TextBlock
Height="36"
Margin="10"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Focusable="True"
FontSize="14"
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding DepotInfo}"
TextWrapping="Wrap" />
</StackPanel>
<DataGrid
Grid.Row="1"
Width="600"
HorizontalAlignment="Center"
IsReadOnly="True"
ItemsSource="{Binding DepotResult}">
<DataGrid.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="3" />
</ItemsPanelTemplate>
</DataGrid.ItemsPanel>
</DataGrid>
<StackPanel
Grid.Row="2"
Margin="27,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
@@ -291,9 +289,7 @@
VerticalAlignment="Center"
Orientation="Vertical"
Visibility="{c:Binding GachaShowDisclaimer}">
<StackPanel
HorizontalAlignment="Center"
Orientation="Horizontal">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<controls:TextBlock
Margin="50,50,0,50"
FontSize="24"
@@ -326,18 +322,24 @@
<EventTrigger RoutedEvent="TextBlock.Loaded">
<BeginStoryboard>
<Storyboard>
<DoubleAnimation Storyboard.TargetName="LinearGradientBrushTranslate" Storyboard.TargetProperty="X" From="0" To="420" Duration="0:0:2" RepeatBehavior="Forever" />
<DoubleAnimation
RepeatBehavior="Forever"
Storyboard.TargetName="LinearGradientBrushTranslate"
Storyboard.TargetProperty="X"
From="0"
To="420"
Duration="0:0:2" />
</Storyboard>
</BeginStoryboard>
</EventTrigger>
</controls:TextBlock.Triggers>
<controls:TextBlock.Effect>
<DropShadowEffect
ShadowDepth="5"
BlurRadius="8"
Color="Black"
Direction="90"
Opacity="0.6" />
<DropShadowEffect
BlurRadius="8"
Direction="90"
Opacity="0.6"
ShadowDepth="5"
Color="Black" />
</controls:TextBlock.Effect>
</controls:TextBlock>
</StackPanel>