Browse Source

Fix #3246: Choppy scrolling when scrolling fast after smooth scrolling introduction

pull/3248/head
tom-englert 11 months ago
parent
commit
b013d6ea4a
  1. 2
      Directory.Packages.props
  2. 5
      ILSpy/MainWindow.xaml
  3. 3
      ILSpy/Metadata/Helpers.cs
  4. 2
      ILSpy/Options/DecompilerSettingsPanel.xaml
  5. 2
      ILSpy/Options/DisplaySettingsPanel.xaml
  6. 4
      ILSpy/Search/SearchPane.xaml
  7. 7
      ILSpy/TextView/DecompilerTextView.xaml

2
Directory.Packages.props

@ -45,7 +45,7 @@ @@ -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.16.0" />
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.17.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
</ItemGroup>
</Project>

5
ILSpy/MainWindow.xaml

@ -35,7 +35,8 @@ @@ -35,7 +35,8 @@
ShowRoot="False"
AllowDropOrder="True"
AllowDrop="True"
BorderThickness="0" Visibility="Visible">
BorderThickness="0" Visibility="Visible"
toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation">
<tv:SharpTreeView.ItemContainerStyle>
<Style TargetType="tv:SharpTreeViewItem">
@ -85,7 +86,7 @@ @@ -85,7 +86,7 @@
<ContentControl Content="{StaticResource SearchPane}" />
</DataTemplate>
<analyzers:AnalyzerTreeView x:Key="AnalyzerTreeView" />
<analyzers:AnalyzerTreeView x:Key="AnalyzerTreeView" toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation" />
<DataTemplate x:Key="AnalyzerPaneTemplate">
<ContentControl Content="{StaticResource AnalyzerTreeView}" />

3
ILSpy/Metadata/Helpers.cs

@ -42,6 +42,8 @@ using ICSharpCode.ILSpy.TextView; @@ -42,6 +42,8 @@ using ICSharpCode.ILSpy.TextView;
using ICSharpCode.ILSpy.TreeNodes;
using ICSharpCode.ILSpy.ViewModels;
using TomsToolbox.Wpf.Interactivity;
namespace ICSharpCode.ILSpy.Metadata
{
static class Helpers
@ -69,6 +71,7 @@ namespace ICSharpCode.ILSpy.Metadata @@ -69,6 +71,7 @@ namespace ICSharpCode.ILSpy.Metadata
ContextMenuProvider.Add(view);
DataGridFilter.SetIsAutoFilterEnabled(view, true);
DataGridFilter.SetContentFilterFactory(view, new RegexContentFilterFactory());
AdvancedScrollWheelBehavior.SetAttach(view, AdvancedScrollWheelMode.WithoutAnimation);
}
DataGridFilter.GetFilter(view).Clear();
view.RowDetailsTemplateSelector = null;

2
ILSpy/Options/DecompilerSettingsPanel.xaml

@ -20,7 +20,7 @@ @@ -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:SmoothScrollingBehavior.Register="True">
<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}" toms:AdvancedScrollWheelBehavior.Attach="WithAnimation">
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="IsTabStop" Value="False"/>

2
ILSpy/Options/DisplaySettingsPanel.xaml

@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
<UserControl.Resources>
<local:FontSizeConverter x:Key="fontSizeConv" />
</UserControl.Resources>
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" toms:SmoothScrollingBehavior.Register="True">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" toms:AdvancedScrollWheelBehavior.Attach="WithAnimation">
<StackPanel Orientation="Vertical">
<DockPanel>
<Label DockPanel.Dock="Left" Content="{x:Static properties:Resources.DisplaySettingsPanel_Theme}" />

4
ILSpy/Search/SearchPane.xaml

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="self" mc:Ignorable="d"
xmlns:toms="urn:TomsToolbox"
d:DesignHeight="300" d:DesignWidth="300">
<Grid>
<Grid.RowDefinitions>
@ -42,7 +43,8 @@ @@ -42,7 +43,8 @@
<ListView Grid.Row="2" BorderThickness="0,1,0,0" HorizontalContentAlignment="Stretch" KeyDown="ListBox_KeyDown"
MouseDoubleClick="ListBox_MouseDoubleClick" Name="listBox" SelectionMode="Single" controls:SortableGridViewColumn.SortMode="Automatic"
controls:GridViewColumnAutoSize.AutoWidth="40%;40%;20%" BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
ItemsSource="{Binding Results, ElementName=self}">
ItemsSource="{Binding Results, ElementName=self}"
toms:AdvancedScrollWheelBehavior.Attach="WithoutAnimation">
<ListView.View>
<GridView AllowsColumnReorder="False">
<controls:SortableGridViewColumn Header="{x:Static properties:Resources.Name}" SortBy="Name">

7
ILSpy/TextView/DecompilerTextView.xaml

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<UserControl x:Class="ICSharpCode.ILSpy.TextView.DecompilerTextView" x:ClassModifier="public" x:Name="self"
<UserControl x:Class="ICSharpCode.ILSpy.TextView.DecompilerTextView" x:Name="self"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:properties="clr-namespace:ICSharpCode.ILSpy.Properties"
@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
xmlns:toms="urn:TomsToolbox"
xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes">
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="boolToVisibility" />
<SolidColorBrush x:Key="waitAdornerBackgoundBrush" Color="{DynamicResource {x:Static SystemColors.WindowColorKey}}" Opacity=".75" />
<Style TargetType="{x:Type editing:TextArea}">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
@ -82,8 +81,8 @@ @@ -82,8 +81,8 @@
Padding="{TemplateBinding Padding}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}"
toms:SmoothScrollingBehavior.Register="true"/>
TextOptions.TextFormattingMode="{Binding CurrentZoom, ElementName=PART_ScrollViewer, Converter={x:Static local:ZoomLevelToTextFormattingModeConverter.Instance}}"
toms:AdvancedScrollWheelBehavior.Attach="WithAnimation" />
<ControlTemplate.Triggers>
<Trigger Property="WordWrap"
Value="True">

Loading…
Cancel
Save