Browse Source

Revert some unwanted changes to the original version

pull/3234/head
SlimeNull 11 months ago
parent
commit
d2d0e52905
  1. 1
      Directory.Packages.props
  2. 6
      ILSpy/Options/DecompilerSettingsPanel.xaml
  3. 4
      SharpTreeView/Themes/Generic.xaml

1
Directory.Packages.props

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
<PackageVersion Include="DataGridExtensions" Version="2.6.0" />
<PackageVersion Include="DiffLib" Version="2017.7.26.1241" />
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
<PackageVersion Include="EleCho.WpfSuite" Version="0.6.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-rc.2.23471.30" />
<PackageVersion Include="Iced" Version="1.21.0" />

6
ILSpy/Options/DecompilerSettingsPanel.xaml

@ -22,11 +22,7 @@ @@ -22,11 +22,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}}"
Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
Padding="-1">
<ListBox Grid.Row="1" ItemsSource="{Binding Source={StaticResource SettingsCollection}}">
<behaviors:Interaction.Behaviors>
<scroll:SmoothScrollingBehavior/>
</behaviors:Interaction.Behaviors>

4
SharpTreeView/Themes/Generic.xaml

@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Default="clr-namespace:ICSharpCode.TreeView"
xmlns:styles="urn:TomsToolbox.Wpf.Styles"
xmlns:ws="https://schemas.elecho.dev/wpfsuite">
xmlns:styles="urn:TomsToolbox.Wpf.Styles">
<Style x:Key="ExpandCollapseToggleStyle"
TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
@ -95,7 +94,6 @@ @@ -95,7 +94,6 @@
<Style TargetType="{x:Type Default:SharpTreeView}"
BasedOn="{StaticResource {x:Static styles:ResourceKeys.ListBoxStyle}}">
<Setter Property="Background" Value="Transparent"/>
<Style.Triggers>
<Trigger Property="ShowRoot"
Value="False">

Loading…
Cancel
Save