From: sr55 <sr55.hb@outlook.com>
Date: Fri, 19 Oct 2018 16:22:21 +0000 (+0100)
Subject: WinGui: Rollback some styling change fixes to see if it fixes the odd behaviour some... 
X-Git-Tag: 1.2.0~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a6c9e92040817aec1cd845f5739611b3a5a31d3;p=handbrake

WinGui: Rollback some styling change fixes to see if it fixes the odd behaviour some users are now seeing in the UI.
---

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 280c0a3f6..6b1fbd63c 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -38,7 +38,7 @@
 
         <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">
             <Style.Resources>
-                <Style TargetType="ContentPresenter" BasedOn="{StaticResource {x:Type ContentPresenter}}">
+                <Style TargetType="ContentPresenter">
                     <Style.Resources>
                         <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
                             <Setter Property="TextWrapping" Value="Wrap" />
diff --git a/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml b/win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml
index 6b9218f91..e19c1bede 100644
--- 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 dd9701a8b..741d072c9 100644
--- 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 57efc39a2..931c16eba 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -273,7 +273,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" />