WinGui: Rollback some styling change fixes to see if it fixes the odd behaviour some...

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 280c0a3f648ae8d4c924b2f3f0d8575769ff6fce..6b1fbd63c5ab7dfc0acdda8f045309a30f1adda3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -38,7 +38,7 @@
 \r
         <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">\r
             <Style.Resources>\r
-                <Style TargetType="ContentPresenter" BasedOn="{StaticResource {x:Type ContentPresenter}}">\r
+                <Style TargetType="ContentPresenter">\r
                     <Style.Resources>\r
                         <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">\r
                             <Setter Property="TextWrapping" Value="Wrap" />\r

diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index 6b9218f919fb86192efef5696c0247706a9e359d..e19c1bede4fbbdaf9fa874f242b432cb70ae807e 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
@@ -149,7 +149,7 @@
                                Height="16"
                                Margin="10,0,10,0">
                             <Image.Style>
-                                <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">
+                                <Style TargetType="{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 dd9701a8b08642e648b8a969b710bd160d08c5b0..741d072c97aa9b0d65b181ca480ee46ac0ac884a 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
+++ b/win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml
@@ -172,7 +172,7 @@
                                 </Image.LayoutTransform>
 
                                 <Image.Style>
-                                    <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">
+                                    <Style TargetType="{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/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 57efc39a2efe0b2c478a55425fe1e97c24b8a159..931c16ebaf28318c021fb1043ef922aa5576759f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -273,7 +273,7 @@
                                 </Image.LayoutTransform>\r
 \r
                                 <Image.Style>\r
-                                    <Style TargetType="{x:Type Image}" BasedOn="{StaticResource {x:Type Image}}">\r
+                                    <Style TargetType="{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