diff options
| author | sr55 <[email protected]> | 2018-10-19 17:22:21 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2018-10-19 17:22:47 +0100 |
| commit | 0a6c9e92040817aec1cd845f5739611b3a5a31d3 (patch) | |
| tree | a21a83817d421847223f225d9099df33d779fe0c /win/CS | |
| parent | a39ac4b832a46bbc8374e346e08ebd4ea8e2428e (diff) | |
WinGui: Rollback some styling change fixes to see if it fixes the odd behaviour some users are now seeing in the UI.
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Queue/Embedded.xaml | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/Queue/QueueTwoContent.xaml | 2 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/QueueView.xaml | 2 |
4 files changed, 4 insertions, 4 deletions
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" />
|