-
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Optimize the scrolling experience #3234
Changes from 6 commits
ef1d436
5698482
0360f8d
8179722
050bb96
b5e24d0
757f705
d2d0e52
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,19 +6,19 @@ | |
xmlns:ilSpy="clr-namespace:ICSharpCode.ILSpy" | ||
xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes" | ||
StartupUri="MainWindow.xaml"> | ||
<Application.Resources> | ||
<Style x:Key="DialogWindow" TargetType="{x:Type Window}"> | ||
<Setter Property="ShowInTaskbar" Value="False"/> | ||
<Setter Property="UseLayoutRounding" Value="True"/> | ||
<Setter Property="TextOptions.TextFormattingMode" Value="Display"/> | ||
<Setter Property="toms:StyleBindings.Behaviors"> | ||
<Setter.Value> | ||
<toms:BehaviorCollection> | ||
<themes:WindowStyleManagerBehavior /> | ||
</toms:BehaviorCollection> | ||
</Setter.Value> | ||
</Setter> | ||
</Style> | ||
<Application.Resources> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's hard to review if you completely reformat whole files. (Applies to many others, too) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you append There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. But I agree that this should be reverted, especially because the only change in this file is the indentation. |
||
<Style x:Key="DialogWindow" TargetType="{x:Type Window}"> | ||
<Setter Property="ShowInTaskbar" Value="False"/> | ||
<Setter Property="UseLayoutRounding" Value="True"/> | ||
<Setter Property="TextOptions.TextFormattingMode" Value="Display"/> | ||
<Setter Property="toms:StyleBindings.Behaviors"> | ||
<Setter.Value> | ||
<toms:BehaviorCollection> | ||
<themes:WindowStyleManagerBehavior /> | ||
</toms:BehaviorCollection> | ||
</Setter.Value> | ||
</Setter> | ||
</Style> | ||
|
||
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Static styles:ResourceKeys.ButtonStyle}}"> | ||
<Setter Property="MinWidth" Value="73" /> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,72 @@ | ||
<UserControl x:Class="ICSharpCode.ILSpy.Options.DecompilerSettingsPanel" | ||
x:ClassModifier="internal" | ||
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" | ||
xmlns:options="clr-namespace:ICSharpCode.ILSpy.Options"> | ||
<UserControl.Resources> | ||
<CollectionViewSource x:Key="SettingsCollection" Source="{Binding Settings}"> | ||
<CollectionViewSource.GroupDescriptions> | ||
<PropertyGroupDescription PropertyName="Category" /> | ||
</CollectionViewSource.GroupDescriptions> | ||
</CollectionViewSource> | ||
</UserControl.Resources> | ||
<Grid> | ||
<Grid.RowDefinitions> | ||
<RowDefinition Height="Auto" /> | ||
<RowDefinition Height="*" /> | ||
</Grid.RowDefinitions> | ||
<Grid.ColumnDefinitions> | ||
<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}}"> | ||
<ListBox.ItemContainerStyle> | ||
<Style TargetType="ListBoxItem"> | ||
<Setter Property="IsTabStop" Value="False"/> | ||
<Setter Property="Focusable" Value="False"/> | ||
</Style> | ||
</ListBox.ItemContainerStyle> | ||
<ListBox.GroupStyle> | ||
<GroupStyle> | ||
<GroupStyle.Panel> | ||
<ItemsPanelTemplate> | ||
<VirtualizingStackPanel Orientation="Vertical" /> | ||
</ItemsPanelTemplate> | ||
</GroupStyle.Panel> | ||
<GroupStyle.ContainerStyle> | ||
<Style TargetType="{x:Type GroupItem}" BasedOn="{StaticResource {x:Type GroupItem}}"> | ||
<Setter Property="Template"> | ||
<Setter.Value> | ||
<ControlTemplate> | ||
<Expander Padding="0" BorderThickness="0" IsExpanded="True"> | ||
<Expander.Header> | ||
<CheckBox Checked="OnGroupChecked" Unchecked="OnGroupUnchecked" Loaded="OnGroupLoaded" VerticalContentAlignment="Center" | ||
FontSize="16" FontWeight="Bold" Content="{Binding Name}" /> | ||
</Expander.Header> | ||
<ItemsPresenter/> | ||
</Expander> | ||
</ControlTemplate> | ||
</Setter.Value> | ||
</Setter> | ||
</Style> | ||
</GroupStyle.ContainerStyle> | ||
</GroupStyle> | ||
</ListBox.GroupStyle> | ||
<ListBox.ItemTemplate> | ||
<DataTemplate> | ||
<CheckBox Margin="19,0,0,0" IsChecked="{Binding IsEnabled}" Content="{Binding Description}" /> | ||
</DataTemplate> | ||
</ListBox.ItemTemplate> | ||
</ListBox> | ||
</Grid> | ||
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" | ||
xmlns:options="clr-namespace:ICSharpCode.ILSpy.Options" | ||
xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" | ||
xmlns:scroll="clr-namespace:LibScrollingOptimization;assembly=LibScrollingOptimization"> | ||
<UserControl.Resources> | ||
<CollectionViewSource x:Key="SettingsCollection" Source="{Binding Settings}"> | ||
<CollectionViewSource.GroupDescriptions> | ||
<PropertyGroupDescription PropertyName="Category" /> | ||
</CollectionViewSource.GroupDescriptions> | ||
</CollectionViewSource> | ||
</UserControl.Resources> | ||
<Grid> | ||
<Grid.RowDefinitions> | ||
<RowDefinition Height="Auto" /> | ||
<RowDefinition Height="*" /> | ||
</Grid.RowDefinitions> | ||
<Grid.ColumnDefinitions> | ||
<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}}" | ||
Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" | ||
BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" | ||
Padding="-1"> | ||
<behaviors:Interaction.Behaviors> | ||
<scroll:SmoothScrollingBehavior/> | ||
</behaviors:Interaction.Behaviors> | ||
<ListBox.ItemContainerStyle> | ||
<Style TargetType="ListBoxItem"> | ||
<Setter Property="IsTabStop" Value="False"/> | ||
<Setter Property="Focusable" Value="False"/> | ||
</Style> | ||
</ListBox.ItemContainerStyle> | ||
<ListBox.GroupStyle> | ||
<GroupStyle> | ||
<GroupStyle.Panel> | ||
<ItemsPanelTemplate> | ||
<VirtualizingStackPanel Orientation="Vertical" /> | ||
</ItemsPanelTemplate> | ||
</GroupStyle.Panel> | ||
<GroupStyle.ContainerStyle> | ||
<Style TargetType="{x:Type GroupItem}" BasedOn="{StaticResource {x:Type GroupItem}}"> | ||
<Setter Property="Template"> | ||
<Setter.Value> | ||
<ControlTemplate> | ||
<Expander Padding="0" BorderThickness="0" IsExpanded="True"> | ||
<Expander.Header> | ||
<CheckBox Checked="OnGroupChecked" Unchecked="OnGroupUnchecked" Loaded="OnGroupLoaded" VerticalContentAlignment="Center" | ||
FontSize="16" FontWeight="Bold" Content="{Binding Name}" /> | ||
</Expander.Header> | ||
<ItemsPresenter/> | ||
</Expander> | ||
</ControlTemplate> | ||
</Setter.Value> | ||
</Setter> | ||
</Style> | ||
</GroupStyle.ContainerStyle> | ||
</GroupStyle> | ||
</ListBox.GroupStyle> | ||
<ListBox.ItemTemplate> | ||
<DataTemplate> | ||
<CheckBox Margin="19,0,0,0" IsChecked="{Binding IsEnabled}" Content="{Binding Description}" /> | ||
</DataTemplate> | ||
</ListBox.ItemTemplate> | ||
</ListBox> | ||
</Grid> | ||
</UserControl> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is BamlDecompiler receiving a new GUID and the new project has the old one?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a VS issue, when editing a solution, old guids will be updated, but new projects start with an old guid.
However the plan is to move the behavior as a public available standard item to toms-toolbox, so this change will be reverted anyway.