Simplify templates with FocusVisualStyleKiller (#156)

* Simplify templates with FocusVisualStyleKiller

* boom

Author: amirburbea

KoAR.SaveEditor/Constructs/LoadingIndicator.cs

@@ -31,7 +31,7 @@ private sealed class CircleLocationConverter : IMultiValueConverter
     {
         object IMultiValueConverter.Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            if (parameter is not DependencyProperty property || values is not { Length: 2 } || values[0] is not double width || values[1] is not string name)
+            if (parameter is not DependencyProperty property || values is not [double width, string name])
             {
                 return DependencyProperty.UnsetValue;
             }

KoAR.SaveEditor/Constructs/TransportObject.cs

@@ -12,5 +12,5 @@ public object? Value
         set => this.SetValue(TransportObject.ValueProperty, value);
     }
 
-    protected override Freezable CreateInstanceCore() => new TransportObject();
+    protected override TransportObject CreateInstanceCore() => new();
 }

KoAR.SaveEditor/Themes/Generic.BuffCollectionManager.xaml

@@ -48,23 +48,21 @@
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                 <Setter Property="VerticalAlignment" Value="Center" />
                 <Setter Property="Margin" Value="2" />
                 <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
             </Style>
         </Style.Resources>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type views:BuffCollectionManager}">
-                    <GroupBox Header="{TemplateBinding Header}" HeaderTemplate="{TemplateBinding HeaderTemplate}" FocusVisualStyle="{x:Null}">
+                    <GroupBox Header="{TemplateBinding Header}" HeaderTemplate="{TemplateBinding HeaderTemplate}">
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
-                            <TreeView x:Name="PART_TreeView" Grid.ColumnSpan="2" BorderBrush="LightGray" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FocusVisualStyle="{x:Null}" Height="150"
+                            <TreeView x:Name="PART_TreeView" Grid.ColumnSpan="2" BorderBrush="LightGray" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Height="150"
                                 ItemsSource="{TemplateBinding Collection}" AlternationCount="2" Foreground="{TemplateBinding Foreground}" ItemTemplate="{StaticResource BuffTemplate}">
                                 <TreeView.Style>
                                     <Style TargetType="{x:Type TreeView}" BasedOn="{StaticResource {x:Type TreeView}}">
@@ -208,7 +206,7 @@
                                     </Style>
                                 </TreeView.ItemContainerStyle>
                             </TreeView>
-                            <GroupBox Header="Add Buff:" BorderThickness="1" BorderBrush="LightGray" FocusVisualStyle="{x:Null}">
+                            <GroupBox Header="Add Buff:" BorderThickness="1" BorderBrush="LightGray">
                                 <GroupBox.Style>
                                     <Style TargetType="{x:Type GroupBox}">
                                         <Style.Triggers>
@@ -248,7 +246,7 @@
                                         </TextBox.Text>
                                     </TextBox>
                                     <Button Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="2" Command="{TemplateBinding AddBuffCommand}" 
-                                        CommandParameter="{TemplateBinding PendingBuffId}" Content="Add" FocusVisualStyle="{x:Null}" />
+                                        CommandParameter="{TemplateBinding PendingBuffId}" Content="Add" />
                                 </Grid>
                             </GroupBox>
                         </Grid>

KoAR.SaveEditor/Themes/Generic.BuffSelector.xaml

@@ -10,7 +10,6 @@
     <constructs:EqualityConverter x:Key="EqualityConverter" />
     <constructs:ComboPanelMaxWidthConverter x:Key="MaxWidthConverter" />
     <Style TargetType="{x:Type views:BuffSelector}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type views:BuffSelector}">
@@ -32,7 +31,7 @@
                         </Border.Resources>
                         <ComboBox x:Name="PART_ComboBox" ItemsSource="{Binding Source={StaticResource DataContainers}}"
                             SelectedValuePath="Data" SelectedValue="{Binding SelectedBuff, RelativeSource={RelativeSource TemplatedParent}}"
-                            HorizontalContentAlignment="Stretch" FocusVisualStyle="{x:Null}" TextSearch.TextPath="Data.ShortDisplayText"
+                            HorizontalContentAlignment="Stretch" TextSearch.TextPath="Data.ShortDisplayText"
                             ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                             <ComboBox.ItemsPanel>
                                 <ItemsPanelTemplate>
@@ -57,11 +56,6 @@
                                     </DataTemplate.Triggers>
                                 </DataTemplate>
                             </ComboBox.ItemTemplate>
-                            <ComboBox.ItemContainerStyle>
-                                <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                                </Style>
-                            </ComboBox.ItemContainerStyle>
                         </ComboBox>
                     </Border>
                 </ControlTemplate>

KoAR.SaveEditor/Themes/Generic.ItemCollectionManager.xaml

@@ -59,7 +59,6 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="Margin" Value="2" />
         <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
@@ -84,7 +83,7 @@
                     </ControlTemplate.Resources>
                     <ListView x:Name="PART_ListView" ItemsSource="{TemplateBinding CollectionView}" TextSearch.TextPath="DisplayName" AlternationCount="2"
                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" VirtualizingPanel.IsVirtualizing="True"
-                        BorderBrush="LightGray" SelectionMode="Single" FocusVisualStyle="{x:Null}" VirtualizingPanel.ScrollUnit="Pixel">
+                        BorderBrush="LightGray" SelectionMode="Single" VirtualizingPanel.ScrollUnit="Pixel">
                         <ListView.Resources>
                             <constructs:TransportObject x:Key="Mode" Value="{Binding Mode, RelativeSource={RelativeSource AncestorType={x:Type views:ItemCollectionManager}}}" />
                             <constructs:TransportObject x:Key="ChangeDefinitionCommand" Value="{Binding ChangeDefinitionCommand, RelativeSource={RelativeSource AncestorType={x:Type views:ItemCollectionManager}}}" />
@@ -96,7 +95,7 @@
                                             <Setter.Value>
                                                 <DataTemplate>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <ContentControl Content="{Binding}" FocusVisualStyle="{x:Null}" />
+                                                        <ContentControl Content="{Binding}" />
                                                         <TextBlock FontFamily="Segoe UI Symbol">
                                                             <TextBlock.Style>
                                                                 <Style TargetType="{x:Type TextBlock}">
@@ -146,8 +145,8 @@
                             </Style>
                         </ListView.ItemContainerStyle>
                         <ListView.ContextMenu>
-                            <ContextMenu FocusVisualStyle="{x:Null}">
-                                <MenuItem Command="{x:Static constructs:ListViewAutoSize.AutoSizeCommand}" FocusVisualStyle="{x:Null}" />
+                            <ContextMenu>
+                                <MenuItem Command="{x:Static constructs:ListViewAutoSize.AutoSizeCommand}" />
                             </ContextMenu>
                         </ListView.ContextMenu>
                         <ListView.View>
@@ -385,7 +384,7 @@
                                 <GridViewColumn Width="Auto" views:ItemCollectionManager.PropertyName="IsStolen">
                                     <GridViewColumn.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox Margin="2" FocusVisualStyle="{x:Null}" VerticalAlignment="Center"
+                                            <CheckBox Margin="2" VerticalAlignment="Center"
                                                 IsChecked="{Binding AllItemsStolen, RelativeSource={RelativeSource TemplatedParent}}">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
@@ -402,7 +401,7 @@
                                     </GridViewColumn.Header>
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate DataType="{x:Type views:ItemModelBase}">
-                                            <CheckBox FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" IsChecked="{Binding IsStolen}">
+                                            <CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsStolen}">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
                                                         <Style.Triggers>
@@ -420,7 +419,7 @@
                                     constructs:ColumnVisibility.IsHidden="{Binding Value, Source={StaticResource Mode}, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static views:Mode.Stash}}">
                                     <GridViewColumn.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox Margin="2" FocusVisualStyle="{x:Null}" VerticalAlignment="Center">
+                                            <CheckBox Margin="2" VerticalAlignment="Center">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
                                                         <Style.Triggers>
@@ -436,7 +435,7 @@
                                     </GridViewColumn.Header>
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate DataType="{x:Type inventory:ItemModel}">
-                                            <CheckBox FocusVisualStyle="{x:Null}" HorizontalAlignment="Center">
+                                            <CheckBox HorizontalAlignment="Center">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
                                                         <Style.Triggers>
@@ -454,7 +453,7 @@
                                     constructs:ColumnVisibility.IsHidden="{Binding Value, Source={StaticResource Mode}, Converter={StaticResource EqualityConverter}, ConverterParameter={x:Static views:Mode.Stash}}">
                                     <GridViewColumn.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox Margin="2" FocusVisualStyle="{x:Null}" VerticalAlignment="Center">
+                                            <CheckBox Margin="2" VerticalAlignment="Center">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
                                                         <Style.Triggers>
@@ -470,7 +469,7 @@
                                     </GridViewColumn.Header>
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate DataType="{x:Type inventory:ItemModel}">
-                                            <CheckBox FocusVisualStyle="{x:Null}" HorizontalAlignment="Center">
+                                            <CheckBox HorizontalAlignment="Center">
                                                 <CheckBox.Style>
                                                     <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
                                                         <Style.Triggers>

KoAR.SaveEditor/Themes/Generic.ItemDefinitionControl.xaml

@@ -17,7 +17,6 @@
                 <Setter Property="Visibility" Value="Collapsed" />
             </Trigger>
         </Style.Triggers>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type views:ItemDefinitionControl}">

KoAR.SaveEditor/Themes/Generic.ItemFiltersEditor.xaml

@@ -87,7 +87,7 @@
                             <RowDefinition />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <Expander Header="Filters:" views:FocusVisualStyleKiller.Kill="True" IsExpanded="{Binding IsExpanded}">
+                        <Expander Header="Filters:" IsExpanded="{Binding IsExpanded}">
                             <Grid>
                                 <Grid.Resources>
                                     <Style TargetType="{x:Type TextBlock}">
@@ -184,7 +184,7 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <Button Grid.Column="8" Content="Reset" FocusVisualStyle="{x:Null}" Margin="2" Height="{Binding ActualHeight, ElementName=PART_Rarities}" VerticalAlignment="Center" 
+                                <Button Grid.Column="8" Content="Reset" Margin="2" Height="{Binding ActualHeight, ElementName=PART_Rarities}" VerticalAlignment="Center" 
                                     Command="{x:Static views:ItemFilters.ResetCommand}" CommandParameter="{Binding}" />
                             </Grid>
                         </Expander>

KoAR.SaveEditor/Themes/Generic.LoadingIndicator.xaml

@@ -3,7 +3,6 @@
     xmlns:constructs="clr-namespace:KoAR.SaveEditor.Constructs"
     xmlns:s="clr-namespace:System;assembly=System.Runtime">
     <Style TargetType="{x:Type constructs:LoadingIndicator}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Width" Value="125" />
         <Setter Property="Height" Value="125" />
         <Setter Property="IsHitTestVisible" Value="False" />

KoAR.SaveEditor/Themes/Generic.ScrollingTabControl.xaml

@@ -7,14 +7,6 @@
         <ResourceDictionary Source="/PresentationFramework.Aero;component/Themes/Aero.NormalColor.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style TargetType="{x:Type constructs:ScrollingTabControl}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="ItemContainerStyle">
-            <Setter.Value>
-                <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
-                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                </Style>
-            </Setter.Value>
-        </Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type constructs:ScrollingTabControl}">
@@ -36,7 +28,6 @@
                                 <Setter Property="IsTabStop" Value="False"/>
                                 <Setter Property="Focusable" Value="False"/>
                                 <Setter Property="ClickMode" Value="Press"/>
-                                <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                                 <Setter Property="Background" Value="{StaticResource ButtonNormalBackground}" />
                                 <Setter Property="BorderBrush" Value="#707070"/>
                                 <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
@@ -79,7 +70,7 @@
                                 </RepeatButton.LayoutTransform>
                             </RepeatButton>
                             <ScrollViewer x:Name="PART_ScrollViewer" IsTabStop="False" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Hidden" 
-                                BorderThickness="0" Padding="0" Grid.Column="1" FocusVisualStyle="{x:Null}" Margin="0,0,0,-1">
+                                BorderThickness="0" Padding="0" Grid.Column="1" Margin="0,0,0,-1">
                                 <TabPanel x:Name="PART_HeaderPanel" IsItemsHost="True" KeyboardNavigation.TabIndex="1" Margin="0,2,0,0" />
                             </ScrollViewer>
                             <RepeatButton Grid.Column="2" x:Name="PART_RightButton" />

KoAR.SaveEditor/Themes/Generic.ZoomScaler.xaml

@@ -6,7 +6,6 @@
         <ResourceDictionary Source="/PresentationFramework.Aero;component/Themes/Aero.NormalColor.xaml" />
     </ResourceDictionary.MergedDictionaries>
     <Style TargetType="{x:Type views:ZoomScaler}">
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type views:ZoomScaler}">
@@ -17,15 +16,9 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <TextBlock Text="{Binding ZoomScale, Source={x:Static p:Settings.Default}, StringFormat='##0%'}" VerticalAlignment="Center" TextAlignment="Right" />
-                        <Slider Grid.Column="1" Value="{Binding ZoomScale, Source={x:Static p:Settings.Default}}" FocusVisualStyle="{x:Null}" Margin="4,0" VerticalAlignment="Center" 
-                            Minimum="{Binding MinZoomScale, Mode=OneTime, Source={x:Static p:Settings.Default}}" Maximum="{Binding MaxZoomScale, Mode=OneTime, Source={x:Static p:Settings.Default}}">
-                            <Slider.Resources>
-                                <Style TargetType="{x:Type Thumb}" BasedOn="{StaticResource {x:Type Thumb}}">
-                                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-                                </Style>
-                            </Slider.Resources>
-                        </Slider>
-                        <Button Command="{x:Static views:ZoomScaler.ResetZoomCommand}" Style="{StaticResource {x:Type Button}}" Grid.Column="2" FocusVisualStyle="{x:Null}" IsDefault="True" Content="Reset" />
+                        <Slider Grid.Column="1" Value="{Binding ZoomScale, Source={x:Static p:Settings.Default}}" Margin="4,0" VerticalAlignment="Center" 
+                            Minimum="{Binding MinZoomScale, Mode=OneTime, Source={x:Static p:Settings.Default}}" Maximum="{Binding MaxZoomScale, Mode=OneTime, Source={x:Static p:Settings.Default}}" />
+                        <Button Command="{x:Static views:ZoomScaler.ResetZoomCommand}" Style="{StaticResource {x:Type Button}}" Grid.Column="2" IsDefault="True" Content="Reset" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>