WinGui: Fix a number of style inheritance issues.

diff --git a/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml b/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml
index 9bfd716ebaf9362a149151f763546bf2fa16f3db..105f08d33fcbbf56495b56bbd09bf3ccbf4f9ffe 100644 (file)
--- 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 818498549b48a84aa81ba898af0e7602b20f9bb4..f1d689770ac9abbad452421f2b7b7976f827476f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -111,7 +111,7 @@
                  SelectionMode="Extended">\r
 \r
             <ListBox.ItemContainerStyle>\r
-                <Style TargetType="ListBoxItem">\r
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />\r
                     <Setter Property="Margin" Value="0,0,0,1" />\r
                 </Style>\r
@@ -216,7 +216,7 @@
                             <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0"\r
                                            Padding="3,0" Height="22" HorizontalAlignment="Left" >\r
                                 <ToggleButton.Style>\r
-                                    <Style TargetType="{x:Type ToggleButton}">\r
+                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">\r
                                         <Setter Property="Content" Value="Show"/>\r
                                         <Setter Property="FontWeight" Value="Bold" />\r
                                         <Style.Triggers>\r

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index 3f0ae31ae4dfe3e354ee04a339e91d96656194fc..f916ff5033af82f2e081d2559d2996921f3eb5c2 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -34,7 +34,7 @@
                   CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility="Column"\r
                   HorizontalGridLinesBrush="#FFABADB3" VerticalGridLinesBrush="#FFABADB3">\r
             <DataGrid.CellStyle>\r
-                <Style TargetType="DataGridCell">\r
+                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">\r
                     <Setter Property="MinHeight" Value="22" />\r
                 </Style>\r
             </DataGrid.CellStyle>\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index d6b796918b959c81196c7e2284e12fac0f4e30ea..280c0a3f648ae8d4c924b2f3f0d8575769ff6fce 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -23,7 +23,7 @@
         <Converters:LongToIntConverter x:Key="longToIntConverter" />\r
         <queue:InlineQueueConverter x:Key="InlineQueueConverter" />\r
 \r
-        <Style TargetType="Button">\r
+        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">\r
             <Setter Property="Padding" Value="8,2" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
             <Setter Property="MinHeight" Value="22" />\r
@@ -31,16 +31,16 @@
 \r
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />\r
 \r
-        <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock">\r
+        <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
             <Setter Property="FontWeight" Value="Bold" />\r
             <Setter Property="Padding" Value="5,5" />\r
         </Style>\r
 \r
-        <Style TargetType="ToolTip">\r
+        <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">\r
             <Style.Resources>\r
-                <Style TargetType="ContentPresenter">\r
+                <Style TargetType="ContentPresenter" BasedOn="{StaticResource {x:Type ContentPresenter}}">\r
                     <Style.Resources>\r
-                        <Style TargetType="TextBlock">\r
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
                             <Setter Property="TextWrapping" Value="Wrap" />\r
                         </Style>\r
                     </Style.Resources>\r
@@ -68,7 +68,7 @@
                   HorizontalAlignment="Stretch"\r
                   VerticalAlignment="Top">\r
                 <Menu.Resources>\r
-                    <Style TargetType="MenuItem">\r
+                    <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}">\r
                         <Setter Property="Height" Value="23" />\r
                     </Style>\r
                 </Menu.Resources>\r
@@ -337,7 +337,7 @@
                               SelectedItem="{Binding Path=SelectedTitle}" >\r
 \r
                         <ComboBox.Style>\r
-                            <Style TargetType="{x:Type ComboBox}">\r
+                            <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">\r
                                 <Style.Triggers>\r
                                     <DataTrigger Binding="{Binding Path=IsDropDownOpen, ElementName=Titles}" Value="True">\r
                                         <Setter Property="DisplayMemberPath" Value="ItemDisplayText" />\r
@@ -580,7 +580,7 @@
                         <HierarchicalDataTemplate DataType="{x:Type loc:Preset}">\r
                             <StackPanel Orientation="Horizontal" >\r
                                 <StackPanel.Resources>\r
-                                    <Style TargetType="TextBlock">\r
+                                    <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
                                         <Style.Triggers>\r
                                             <DataTrigger Binding="{Binding IsDefault}" Value="True" >\r
                                                 <Setter Property="FontStyle" Value="Italic" />\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index fa0e88940b941e0317061a66b395b397bbf69006..be4f98cff27cf1b95a3c093d3725e79e41cf56ce 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -5,30 +5,30 @@
               xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">\r
 \r
     <UserControl.Resources>\r
-        <Style TargetType="Button">\r
+        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">\r
             <Setter Property="Padding" Value="8,2" />\r
             <Setter Property="FontSize" Value="11.5" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
             <Setter Property="MinHeight" Value="22" />\r
         </Style>\r
 \r
-        <Style TargetType="TextBlock">\r
+        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
             <Setter Property="Margin" Value="0,0,5,0" />\r
         </Style>\r
 \r
-        <Style TargetType="TextBox">\r
+        <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">\r
             <Setter Property="Padding" Value="5,2" />\r
             <Setter Property="MinHeight" Value="22" />\r
             <Setter Property="VerticalContentAlignment" Value="Center" />\r
             <Setter Property="ToolTipService.ShowDuration" Value="20000" />\r
         </Style>\r
 \r
-        <Style TargetType="CheckBox">\r
+        <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">\r
             <Setter Property="Margin" Value="0,2,0,2" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
         </Style>\r
 \r
-        <Style TargetType="ListBoxItem">\r
+        <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
             <Setter Property="Padding" Value="8,4" />\r
         </Style>\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index 80191a3a743090be4e8739664a2a328d0850f011..6b9218f919fb86192efef5696c0247706a9e359d 100644 (file)
--- 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 31a915fc1e8fbe634397bdd83fe96af037fec66d..dd9701a8b08642e648b8a969b710bd160d08c5b0 100644 (file)
--- 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 88404166e27c1b2cfaef3922850d616627767a87..6346727580cfb163907c2784377592cc9fcdcbd4 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml
@@ -53,7 +53,7 @@
                  SelectionMode="Single" \r
                  PreviewKeyDown="SelectionGrid_OnKeyDown">\r
             <ListBox.ItemContainerStyle>\r
-                <Style TargetType="ListBoxItem">\r
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />\r
                     <Setter Property="Margin" Value="0,0,0,1" />\r
                 </Style>\r

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 34f959cf887e60af130c086f236f6b24d35f302c..57efc39a2efe0b2c478a55425fe1e97c24b8a159 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -198,14 +198,14 @@
                 </ListBox.ContextMenu>\r
 \r
                 <ListBox.ItemContainerStyle>\r
-                    <Style TargetType="{x:Type ListBoxItem}">\r
+                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
                         <Setter Property="HorizontalContentAlignment" Value="Stretch" />\r
                         <Setter Property="Margin" Value="0,0,0,1" />\r
                         <Setter Property="ToolTip">\r
                             <Setter.Value>\r
                                 <Grid MaxWidth="650" Margin="0,5,0,5" Style="{StaticResource LongToolTipHolder}">\r
                                     <Grid.Resources>\r
-                                        <Style TargetType="TextBlock">\r
+                                        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
                                             <Setter Property="Margin" Value="0,5,0,5" />\r
                                         </Style>\r
                                     </Grid.Resources>\r
@@ -273,7 +273,7 @@
                                 </Image.LayoutTransform>\r
 \r
                                 <Image.Style>\r
-                                    <Style TargetType="{x:Type Image}">\r
+                                    <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">\r
                                         <Style.Triggers>\r
                                             <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">\r
                                                 <Setter Property="Source" Value="Images\Movies.png" />\r

diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index c4a4273e2c3add017bf0b0509f0f0835cba0b3a1..9bcca063546c0721dbdbef338cff6847e0c22423 100644 (file)
--- 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" />\r
     </Style>\r
 \r
-    <Style TargetType="{x:Type ComboBox}">\r
+    <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">\r
         <Setter Property="MinHeight" Value="22"/>\r
         <Setter Property="Margin" Value="0,2,0,2" />\r
     </Style>\r
 \r
-    <Style TargetType="{x:Type TextBlock}">\r
+    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">\r
         <Setter Property="VerticalAlignment" Value="Center"/>\r
     </Style>\r
-    \r
-    <Style TargetType="{x:Type TextBox}">\r
+\r
+    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">\r
         <Setter Property="VerticalContentAlignment" Value="Center"/>\r
         <Setter Property="MinHeight" Value="20"/>\r
     </Style>\r
 \r
-    <Style TargetType="{x:Type Button}">\r
+    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">\r
         <Setter Property="MinHeight" Value="22"/>\r
     </Style>\r
 \r
-    <Style TargetType="{x:Type RadioButton}">\r
+    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource {x:Type RadioButton}}">\r
         <Setter Property="Margin" Value="0,0,0,8" />\r
     </Style>\r
 \r
     <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>\r
 \r
-    <Style x:Key="DropButtonStyle" TargetType="ToggleButton" >\r
+    <Style x:Key="DropButtonStyle" TargetType="ToggleButton"  BasedOn="{StaticResource {x:Type ToggleButton}}">\r
         <Setter Property="Padding" Value="2,2" />\r
         <Setter Property="ContentTemplate">\r
             <Setter.Value>\r
@@ -52,7 +52,7 @@
         </Setter>\r
     </Style>\r
 \r
-    <Style x:Key="hoverlessListBoxItemStyle" TargetType="{x:Type ListBoxItem}">\r
+    <Style x:Key="hoverlessListBoxItemStyle" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
         <Setter Property="Background" Value="Transparent"/>\r
         <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>\r
         <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>\r
@@ -90,7 +90,7 @@
 \r
     <!-- Fixes HorizontalContentAlignment and VerticalContentAlignment binding errors that you get when you setup MenuItems by binding their ItemSource property -->\r
     <!-- https://social.msdn.microsoft.com/Forums/vstudio/en-US/42cd1554-de7a-473b-b977-ddbd6298b3d0/binding-error-when-using-compositecollection-for-menuitems?forum=wpf -->\r
-    <Style TargetType="MenuItem">\r
+    <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}">\r
         <Setter Property="HorizontalContentAlignment" Value="Left"/>\r
         <Setter Property="VerticalContentAlignment" Value="Center"/>\r
     </Style>\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 332efb1c795dc79a81f7f0bdbe652e346e67b354..098a1f5c45bfdcadd78e69bfb0bf9a1752e84a3b 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -112,7 +112,7 @@
                  SelectionMode="Extended">\r
 \r
             <ListBox.ItemContainerStyle>\r
-                <Style TargetType="ListBoxItem">\r
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">\r
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />\r
                     <Setter Property="Margin" Value="0,0,0,1" />\r
                 </Style>\r

diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index 43c407654bfdbc985ab4423b7e2da575a9a234db..10027f60ec8e6ed86176ffc5605e18ea0c51bb47 100644 (file)
--- 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>