From 83851d9b06699386e71cec92544f48232e4760f4 Mon Sep 17 00:00:00 2001
From: taoye <kensouterry@163.com>
Date: Wed, 24 Aug 2022 10:13:01 +0800
Subject: [PATCH] =?UTF-8?q?180=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/RecipeSettingsView.xaml                    |  2 +-
 FryPot_DosingSystem/View/RecipesSendDown.xaml       | 13 ++++++-------
 FryPot_DosingSystem/View/RecipesSendDown.xaml.cs    |  8 ++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/View/RecipeSettingsView.xaml b/BPASmartClient.JXJFoodSmallStation/View/RecipeSettingsView.xaml
index 86af1192..f3997680 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/RecipeSettingsView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/RecipeSettingsView.xaml
@@ -148,7 +148,7 @@
         </Grid>-->
         <!--#endregion-->
 
-        <ScrollViewer Grid.Row="2">
+        <ScrollViewer Grid.Row="2" HorizontalScrollBarVisibility="Disabled">
             <ListView
                 Margin="5"
                 VerticalAlignment="Top"
diff --git a/FryPot_DosingSystem/View/RecipesSendDown.xaml b/FryPot_DosingSystem/View/RecipesSendDown.xaml
index eaa15085..73b465c5 100644
--- a/FryPot_DosingSystem/View/RecipesSendDown.xaml
+++ b/FryPot_DosingSystem/View/RecipesSendDown.xaml
@@ -50,9 +50,8 @@
             <RowDefinition/>
         </Grid.RowDefinitions>
         <Button HorizontalAlignment="Right" VerticalAlignment="Center" Content="配方一键下发" Width="110" Height="30"  Margin="0,0,10,0" Cursor="Hand" Command="{Binding AllRecipeSetDownCommand}"></Button>
-        <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" >
+        <ScrollViewer Name="sv" Grid.Row="1" PreviewMouseWheel="ScrollViewer_PreviewMouseWheel"  VerticalScrollBarVisibility="Hidden" >
             <ListView
-                Margin="5"
                 VerticalAlignment="Top"
                 Background="Transparent"
                 BorderThickness="0"
@@ -60,16 +59,17 @@
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <UniformGrid
+                        <!--<UniformGrid
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="8" />
+                            Columns="8" />-->
+                        <WrapPanel/>
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
 
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Border Margin="5" Background="LightSkyBlue">
+                        <Border Margin="3.5" Width="230" Height="280" Background="LightSkyBlue">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition />
@@ -91,13 +91,12 @@
                                     Name="gr"
                                     Grid.Row="2"
                                     Height="30"
+                                    Margin="0,0,0,-9"
                                     Background="#00BEFA">
 
                                     <pry:IcoButton
                                         Width="{Binding ElementName=gr, Path=ActualWidth}"
                                         Height="{Binding ElementName=gr, Path=ActualHeight}"
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
                                         BorderThickness="0"
                                         Command="{Binding DataContext.RecipeSetDownCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
                                         CommandParameter="{Binding RecipeId}"
diff --git a/FryPot_DosingSystem/View/RecipesSendDown.xaml.cs b/FryPot_DosingSystem/View/RecipesSendDown.xaml.cs
index 2b243032..f392f449 100644
--- a/FryPot_DosingSystem/View/RecipesSendDown.xaml.cs
+++ b/FryPot_DosingSystem/View/RecipesSendDown.xaml.cs
@@ -24,5 +24,13 @@ namespace FryPot_DosingSystem.View
         {
             InitializeComponent();
         }
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta);
+            eventArg.RoutedEvent = UIElement.MouseWheelEvent;
+            eventArg.Source = sender;
+            sv.RaiseEvent(eventArg);
+        }
     }
 }