From cf78fc0eb0a452ae585477209ab377ab2c79e8a7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GPE37UV\\THINKAPD" <tw919@qq.com>
Date: Fri, 2 Dec 2022 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96RecipeEditor=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=8F=96=E6=B6=88=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=BB=9A=E5=8A=A8=E4=BB=A5=E5=87=8F=E7=BC=93=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UIClient/DataGridTransform/DataGrid/Themes/Generic.xaml   | 4 ++--
 SicUI/Models/RecipeEditors/RecipeEditorView.xaml              | 1 +
 SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/FrameworkLocal/UIClient/DataGridTransform/DataGrid/Themes/Generic.xaml b/FrameworkLocal/UIClient/DataGridTransform/DataGrid/Themes/Generic.xaml
index 22022bf..503dd9e 100644
--- a/FrameworkLocal/UIClient/DataGridTransform/DataGrid/Themes/Generic.xaml
+++ b/FrameworkLocal/UIClient/DataGridTransform/DataGrid/Themes/Generic.xaml
@@ -55,7 +55,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         SnapsToDevicePixels="True">
-                        <ScrollViewer Name="DG_ScrollViewer" Focusable="false">
+                        <ScrollViewer Name="DG_ScrollViewer" Focusable="false" IsDeferredScrollingEnabled="True">
                             <ScrollViewer.Template>
                                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                                     <Grid>
@@ -325,7 +325,7 @@
                                                     Storyboard.TargetProperty= "Opacity" 
                                                     From="0"
                                                     To="1"
-                                                    Duration="0:0:1.0" AutoReverse="False"/>
+                                                    Duration="0:0:0.300" AutoReverse="False"/>
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger>
diff --git a/SicUI/Models/RecipeEditors/RecipeEditorView.xaml b/SicUI/Models/RecipeEditors/RecipeEditorView.xaml
index dab5c61..1db1a1c 100644
--- a/SicUI/Models/RecipeEditors/RecipeEditorView.xaml
+++ b/SicUI/Models/RecipeEditors/RecipeEditorView.xaml
@@ -1529,6 +1529,7 @@
                                 Width="{Binding ElementName=dgContainer, Path=Height}" 
                                 Height="{Binding ElementName=dgContainer, Path=Width}"
                                 SelectedItemsList="{Binding SelectedRecipeSteps,  Mode=OneWayToSource, Converter={StaticResource SelectedRecipeStepsToList}}"
+                                ItemsSource="{Binding CurrentRecipe.Steps}"
                                 LoadingRow="DgCustom_OnLoadingRow"
                                 UnloadingRow="DgCustom_OnUnloadingRow"
                                 BeginningEdit="DgCustom_OnBeginningEdit">
diff --git a/SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs b/SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs
index 4f7504b..8ebaa88 100644
--- a/SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs
+++ b/SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs
@@ -481,7 +481,7 @@ namespace SicUI.Models.RecipeEditors
 
             });
 
-            u.dgCustom.ItemsSource = CurrentRecipe.Steps;
+            //u.dgCustom.ItemsSource = CurrentRecipe.Steps;
             u.dgCustom.LostFocus += DgCustom_LostFocus;
             u.dgCustom.CellEditEnding += DgCustomOnCellEditEnding;
             u.dgCustom.LoadingRow += DgCustomOnLoadingRow;