From 64c1d1bd08deda26040c25b3b27c68d1c8516f12 Mon Sep 17 00:00:00 2001
From: tom-englert <thomas.englert@avl.com>
Date: Fri, 2 Aug 2024 08:43:14 +0200
Subject: [PATCH] Update TomsToolbox to fix AdvancedScrollWheelBehavior and
 apply to all scroll viewers.

---
 Directory.Packages.props                   | 2 +-
 ILSpy/App.xaml                             | 5 ++++-
 ILSpy/MainWindow.xaml                      | 5 ++---
 ILSpy/Options/DecompilerSettingsPanel.xaml | 2 +-
 ILSpy/Options/DisplaySettingsPanel.xaml    | 2 +-
 ILSpy/TextView/DecompilerTextView.xaml     | 3 +--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 26776ab07..3c7a7f15f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,7 +45,7 @@
     <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.17.1" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.17.2" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ILSpy/App.xaml b/ILSpy/App.xaml
index 151558268..0cfda48ce 100644
--- a/ILSpy/App.xaml
+++ b/ILSpy/App.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:styles="urn:TomsToolbox.Wpf.Styles"
              xmlns:toms="urn:TomsToolbox"
-             xmlns:ilSpy="clr-namespace:ICSharpCode.ILSpy"
              xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes"
              StartupUri="MainWindow.xaml">
 	<Application.Resources>
@@ -25,5 +24,9 @@
 			<Setter Property="Padding" Value="9,1,9,1" />
 		</Style>
 
+		<Style TargetType="ScrollViewer">
+			<Setter Property="toms:AdvancedScrollWheelBehavior.Attach" Value="WithAnimation" />
+		</Style>
+
 	</Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index cd6b8d9f0..6f423f315 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -35,8 +35,7 @@
 				ShowRoot="False"
 				AllowDropOrder="True"
 				AllowDrop="True"
-				BorderThickness="0" Visibility="Visible"
-				toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation">
+				BorderThickness="0" Visibility="Visible">
 			<tv:SharpTreeView.ItemContainerStyle>
 				<Style TargetType="tv:SharpTreeViewItem">
 
@@ -86,7 +85,7 @@
 			<ContentControl Content="{StaticResource SearchPane}" />
 		</DataTemplate>
 
-		<analyzers:AnalyzerTreeView x:Key="AnalyzerTreeView" toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation" />
+		<analyzers:AnalyzerTreeView x:Key="AnalyzerTreeView" />
 
 		<DataTemplate x:Key="AnalyzerPaneTemplate">
 			<ContentControl Content="{StaticResource AnalyzerTreeView}" />
diff --git a/ILSpy/Options/DecompilerSettingsPanel.xaml b/ILSpy/Options/DecompilerSettingsPanel.xaml
index 460815ad4..2e16f5054 100644
--- a/ILSpy/Options/DecompilerSettingsPanel.xaml
+++ b/ILSpy/Options/DecompilerSettingsPanel.xaml
@@ -20,7 +20,7 @@
 			<ColumnDefinition Width="*" />
 		</Grid.ColumnDefinitions>
 		<TextBlock Margin="3" Grid.ColumnSpan="3" TextWrapping="Wrap" Text="{x:Static properties:Resources.DecompilerSettingsPanelLongText}" />
-		<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}" toms:AdvancedScrollWheelBehavior.Attach="WithAnimation">
+		<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}">
 			<ListBox.ItemContainerStyle>
 				<Style TargetType="ListBoxItem">
 					<Setter Property="IsTabStop" Value="False"/>
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml b/ILSpy/Options/DisplaySettingsPanel.xaml
index 75ee1ae97..846a33c06 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml
@@ -12,7 +12,7 @@
 	<UserControl.Resources>
 		<local:FontSizeConverter x:Key="fontSizeConv" />
 	</UserControl.Resources>
-	<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" toms:AdvancedScrollWheelBehavior.Attach="WithAnimation">
+	<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
 		<StackPanel Orientation="Vertical">
 			<DockPanel>
 				<Label DockPanel.Dock="Left" Content="{x:Static properties:Resources.DisplaySettingsPanel_Theme}" />
diff --git a/ILSpy/TextView/DecompilerTextView.xaml b/ILSpy/TextView/DecompilerTextView.xaml
index 99121efd3..0b9f701e5 100644
--- a/ILSpy/TextView/DecompilerTextView.xaml
+++ b/ILSpy/TextView/DecompilerTextView.xaml
@@ -81,8 +81,7 @@
 								Padding="{TemplateBinding Padding}"
 								BorderBrush="{TemplateBinding BorderBrush}"
 								BorderThickness="{TemplateBinding BorderThickness}"
-								TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}"
-								toms:AdvancedScrollWheelBehavior.Attach="WithAnimation" />
+								TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}"/>
 							<ControlTemplate.Triggers>
 								<Trigger Property="WordWrap"
 								         Value="True">