From 45cfb8fdbeea65a696a6f579809e7836a78d112a Mon Sep 17 00:00:00 2001
From: tom-englert <thomas.englert@avl.com>
Date: Sat, 3 Aug 2024 15:10:02 +0200
Subject: [PATCH] Fix #3249: Settings panel shows strange hover/selection
 behavior

---
 ILSpy/Options/DecompilerSettingsPanel.xaml | 82 ++++++++++------------
 ILSpy/Options/DisplaySettingsPanel.xaml    |  1 -
 2 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/ILSpy/Options/DecompilerSettingsPanel.xaml b/ILSpy/Options/DecompilerSettingsPanel.xaml
index 2e16f5054..f257d8654 100644
--- a/ILSpy/Options/DecompilerSettingsPanel.xaml
+++ b/ILSpy/Options/DecompilerSettingsPanel.xaml
@@ -1,9 +1,12 @@
 <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:toms="urn:TomsToolbox">
+             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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:options="clr-namespace:ICSharpCode.ILSpy.Options"
+             d:DataContext="{d:DesignInstance options:DecompilerSettingsViewModel}">
 	<UserControl.Resources>
 		<CollectionViewSource x:Key="SettingsCollection" Source="{Binding Settings}">
 			<CollectionViewSource.GroupDescriptions>
@@ -20,44 +23,37 @@
 			<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>
+		<ScrollViewer Grid.Row="1">
+			<ItemsControl ItemsSource="{Binding Source={StaticResource SettingsCollection}}">
+				<ItemsControl.GroupStyle>
+					<GroupStyle>
+						<GroupStyle.ContainerStyle>
+							<Style TargetType="{x:Type GroupItem}" BasedOn="{StaticResource {x:Type GroupItem}}">
+								<Setter Property="Template">
+									<Setter.Value>
+										<ControlTemplate TargetType="GroupItem">
+											<Expander Padding="0" BorderThickness="0" IsExpanded="True">
+												<Expander.Header>
+													<CheckBox Checked="OnGroupChecked" Unchecked="OnGroupUnchecked" Loaded="OnGroupLoaded" VerticalContentAlignment="Center" 
+													          FontSize="16" FontWeight="Bold" 
+													          d:DataContext="{d:DesignInstance GroupItem}" 
+													          Content="{Binding Name}" />
+												</Expander.Header>
+												<ItemsPresenter />
+											</Expander>
+										</ControlTemplate>
+									</Setter.Value>
+								</Setter>
+							</Style>
+						</GroupStyle.ContainerStyle>
+					</GroupStyle>
+				</ItemsControl.GroupStyle>
+				<ItemsControl.ItemTemplate>
+					<DataTemplate>
+						<CheckBox Margin="19,0,0,0" IsChecked="{Binding IsEnabled}" Content="{Binding Description}" />
+					</DataTemplate>
+				</ItemsControl.ItemTemplate>
+			</ItemsControl>
+		</ScrollViewer>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff --git a/ILSpy/Options/DisplaySettingsPanel.xaml b/ILSpy/Options/DisplaySettingsPanel.xaml
index 846a33c06..52f5c3ab1 100644
--- a/ILSpy/Options/DisplaySettingsPanel.xaml
+++ b/ILSpy/Options/DisplaySettingsPanel.xaml
@@ -7,7 +7,6 @@
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 			 xmlns:themes="clr-namespace:ICSharpCode.ILSpy.Themes"
-			 xmlns:toms="urn:TomsToolbox"
 			 d:DataContext="{d:DesignInstance local:DisplaySettingsViewModel}">
 	<UserControl.Resources>
 		<local:FontSizeConverter x:Key="fontSizeConv" />