From acee00072b04e9a86f9238fd1430e33e3b08a5d1 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 15 Oct 2018 22:31:50 +0100
Subject: [PATCH] WinGui: Fix a number of style inheritance issues.

---
 .../HandBrakeWPF/Views/AudioDefaultsView.xaml  |  2 +-
 win/CS/HandBrakeWPF/Views/AudioView.xaml       |  4 ++--
 win/CS/HandBrakeWPF/Views/ChaptersView.xaml    |  2 +-
 win/CS/HandBrakeWPF/Views/MainView.xaml        | 16 ++++++++--------
 win/CS/HandBrakeWPF/Views/OptionsView.xaml     | 10 +++++-----
 win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml  |  6 +++---
 .../Views/Queue/QueueTwoContent.xaml           | 10 +++++-----
 .../HandBrakeWPF/Views/QueueSelectionView.xaml |  2 +-
 win/CS/HandBrakeWPF/Views/QueueView.xaml       |  6 +++---
 win/CS/HandBrakeWPF/Views/Styles/Styles.xaml   | 18 +++++++++---------
 win/CS/HandBrakeWPF/Views/SubtitlesView.xaml   |  2 +-
 win/CS/HandBrakeWPF/Views/SummaryView.xaml     |  4 ++--
 12 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
index 9bfd716eb..105f08d33 100644
--- a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
@@ -189,7 +189,7 @@
                  SelectionMode="Extended">
 
             <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 818498549..f1d689770 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -111,7 +111,7 @@
                  SelectionMode="Extended">
 
             <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
@@ -216,7 +216,7 @@
                             <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0"
                                            Padding="3,0" Height="22" HorizontalAlignment="Left" >
                                 <ToggleButton.Style>
-                                    <Style TargetType="{x:Type ToggleButton}">
+                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
                                         <Setter Property="Content" Value="Show"/>
                                         <Setter Property="FontWeight" Value="Bold" />
                                         <Style.Triggers>
diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index 3f0ae31ae..f916ff503 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -34,7 +34,7 @@
                   CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility="Column"
                   HorizontalGridLinesBrush="#FFABADB3" VerticalGridLinesBrush="#FFABADB3">
             <DataGrid.CellStyle>
-                <Style TargetType="DataGridCell">
+                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                     <Setter Property="MinHeight" Value="22" />
                 </Style>
             </DataGrid.CellStyle>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index d6b796918..280c0a3f6 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -23,7 +23,7 @@
         <Converters:LongToIntConverter x:Key="longToIntConverter" />
         <queue:InlineQueueConverter x:Key="InlineQueueConverter" />
 
-        <Style TargetType="Button">
+        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
             <Setter Property="Padding" Value="8,2" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="MinHeight" Value="22" />
@@ -31,16 +31,16 @@
 
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 
-        <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock">
+        <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
             <Setter Property="FontWeight" Value="Bold" />
             <Setter Property="Padding" Value="5,5" />
         </Style>
 
-        <Style TargetType="ToolTip">
+        <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">
             <Style.Resources>
-                <Style TargetType="ContentPresenter">
+                <Style TargetType="ContentPresenter" BasedOn="{StaticResource {x:Type ContentPresenter}}">
                     <Style.Resources>
-                        <Style TargetType="TextBlock">
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                             <Setter Property="TextWrapping" Value="Wrap" />
                         </Style>
                     </Style.Resources>
@@ -68,7 +68,7 @@
                   HorizontalAlignment="Stretch"
                   VerticalAlignment="Top">
                 <Menu.Resources>
-                    <Style TargetType="MenuItem">
+                    <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}">
                         <Setter Property="Height" Value="23" />
                     </Style>
                 </Menu.Resources>
@@ -337,7 +337,7 @@
                               SelectedItem="{Binding Path=SelectedTitle}" >
 
                         <ComboBox.Style>
-                            <Style TargetType="{x:Type ComboBox}">
+                            <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding Path=IsDropDownOpen, ElementName=Titles}" Value="True">
                                         <Setter Property="DisplayMemberPath" Value="ItemDisplayText" />
@@ -580,7 +580,7 @@
                         <HierarchicalDataTemplate DataType="{x:Type loc:Preset}">
                             <StackPanel Orientation="Horizontal" >
                                 <StackPanel.Resources>
-                                    <Style TargetType="TextBlock">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding IsDefault}" Value="True" >
                                                 <Setter Property="FontStyle" Value="Italic" />
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index fa0e88940..be4f98cff 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -5,30 +5,30 @@
               xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">
 
     <UserControl.Resources>
-        <Style TargetType="Button">
+        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
             <Setter Property="Padding" Value="8,2" />
             <Setter Property="FontSize" Value="11.5" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="MinHeight" Value="22" />
         </Style>
 
-        <Style TargetType="TextBlock">
+        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
             <Setter Property="Margin" Value="0,0,5,0" />
         </Style>
 
-        <Style TargetType="TextBox">
+        <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
             <Setter Property="Padding" Value="5,2" />
             <Setter Property="MinHeight" Value="22" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="ToolTipService.ShowDuration" Value="20000" />
         </Style>
 
-        <Style TargetType="CheckBox">
+        <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
             <Setter Property="Margin" Value="0,2,0,2" />
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
-        <Style TargetType="ListBoxItem">
+        <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
             <Setter Property="Padding" Value="8,4" />
         </Style>
 
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index 80191a3a7..6b9218f91 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
@@ -76,14 +76,14 @@
             </ListBox.ContextMenu>
 
             <ListBox.ItemContainerStyle>
-                <Style TargetType="{x:Type ListBoxItem}">
+                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                     <Setter Property="ToolTip">
                         <Setter.Value>
                             <Grid MaxWidth="650" Margin="0,5,0,5" Style="{StaticResource LongToolTipHolder}">
                                 <Grid.Resources>
-                                    <Style TargetType="TextBlock">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                                         <Setter Property="Margin" Value="0,5,0,5" />
                                     </Style>
                                 </Grid.Resources>
@@ -149,7 +149,7 @@
                                Height="16"
                                Margin="10,0,10,0">
                             <Image.Style>
-                                <Style TargetType="{x:Type Image}">
+                                <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
                                             <Setter Property="Source" Value="..\Images\Movies.png" />
diff --git a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
index 31a915fc1..dd9701a8b 100644
--- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
@@ -148,7 +148,7 @@
                 </ListBox.ContextMenu>
 
                 <ListBox.ItemContainerStyle>
-                    <Style TargetType="{x:Type ListBoxItem}">
+                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                         <Setter Property="Margin" Value="0,0,0,1" />
                     </Style>
@@ -172,7 +172,7 @@
                                 </Image.LayoutTransform>
 
                                 <Image.Style>
-                                    <Style TargetType="{x:Type Image}">
+                                    <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
                                                 <Setter Property="Source" Value="..\Images\Movies.png" />
@@ -254,7 +254,7 @@
                             <StackPanel Orientation="Horizontal" >
 
                                 <StackPanel.Resources>
-                                    <Style TargetType="Button">
+                                    <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
                                         <Setter Property="Padding" Value="8,2" />
                                     </Style>
                                 </StackPanel.Resources>
@@ -317,7 +317,7 @@
 
                             <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,5,0,0" >
                                 <Grid.Resources>
-                                    <Style TargetType="TextBlock">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                                         <Setter Property="Margin" Value="0,5,0,5" />
                                     </Style>
                                 </Grid.Resources>
@@ -372,7 +372,7 @@
 
                             <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,5,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}">
                                 <Grid.Resources>
-                                    <Style TargetType="TextBlock">
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                                         <Setter Property="Margin" Value="0,5,0,5" />
                                     </Style>
                                 </Grid.Resources>
diff --git a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
index 88404166e..634672758 100644
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -53,7 +53,7 @@
                  SelectionMode="Single" 
                  PreviewKeyDown="SelectionGrid_OnKeyDown">
             <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 34f959cf8..57efc39a2 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -198,14 +198,14 @@
                 </ListBox.ContextMenu>
 
                 <ListBox.ItemContainerStyle>
-                    <Style TargetType="{x:Type ListBoxItem}">
+                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                         <Setter Property="Margin" Value="0,0,0,1" />
                         <Setter Property="ToolTip">
                             <Setter.Value>
                                 <Grid MaxWidth="650" Margin="0,5,0,5" Style="{StaticResource LongToolTipHolder}">
                                     <Grid.Resources>
-                                        <Style TargetType="TextBlock">
+                                        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                                             <Setter Property="Margin" Value="0,5,0,5" />
                                         </Style>
                                     </Grid.Resources>
@@ -273,7 +273,7 @@
                                 </Image.LayoutTransform>
 
                                 <Image.Style>
-                                    <Style TargetType="{x:Type Image}">
+                                    <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">
                                         <Style.Triggers>
                                             <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
                                                 <Setter Property="Source" Value="Images\Movies.png" />
diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index c4a4273e2..9bcca0635 100644
--- a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
+++ b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
@@ -5,31 +5,31 @@
         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
     </Style>
 
-    <Style TargetType="{x:Type ComboBox}">
+    <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
         <Setter Property="MinHeight" Value="22"/>
         <Setter Property="Margin" Value="0,2,0,2" />
     </Style>
 
-    <Style TargetType="{x:Type TextBlock}">
+    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
         <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
-    
-    <Style TargetType="{x:Type TextBox}">
+
+    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="MinHeight" Value="20"/>
     </Style>
 
-    <Style TargetType="{x:Type Button}">
+    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="MinHeight" Value="22"/>
     </Style>
 
-    <Style TargetType="{x:Type RadioButton}">
+    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource {x:Type RadioButton}}">
         <Setter Property="Margin" Value="0,0,0,8" />
     </Style>
 
     <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
 
-    <Style x:Key="DropButtonStyle" TargetType="ToggleButton" >
+    <Style x:Key="DropButtonStyle" TargetType="ToggleButton"  BasedOn="{StaticResource {x:Type ToggleButton}}">
         <Setter Property="Padding" Value="2,2" />
         <Setter Property="ContentTemplate">
             <Setter.Value>
@@ -52,7 +52,7 @@
         </Setter>
     </Style>
 
-    <Style x:Key="hoverlessListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
+    <Style x:Key="hoverlessListBoxItemStyle" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
@@ -90,7 +90,7 @@
 
     <!-- Fixes HorizontalContentAlignment and VerticalContentAlignment binding errors that you get when you setup MenuItems by binding their ItemSource property -->
     <!-- https://social.msdn.microsoft.com/Forums/vstudio/en-US/42cd1554-de7a-473b-b977-ddbd6298b3d0/binding-error-when-using-compositecollection-for-menuitems?forum=wpf -->
-    <Style TargetType="MenuItem">
+    <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}">
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 332efb1c7..098a1f5c4 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -112,7 +112,7 @@
                  SelectionMode="Extended">
 
             <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
                     <Setter Property="Margin" Value="0,0,0,1" />
                 </Style>
diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index 43c407654..10027f60e 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -46,10 +46,10 @@
             </Grid.RowDefinitions>
 
             <Grid.Resources>
-                <Style TargetType="TextBlock">
+                <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                     <Setter Property="Margin" Value="0,3,0,3" />
                 </Style>
-                <Style TargetType="CheckBox">
+                <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
                     <Setter Property="Margin" Value="0,2,0,2" />
                 </Style>
             </Grid.Resources>
-- 
2.40.0