Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tweaked video player

  • Loading branch information...
commit 47667577dd9158072340f4f99cb0374c6069f765 1 parent b445002
@dougrathbone authored
Showing with 3 additions and 7 deletions.
  1. +3 −7 OpenAttractor/VideoPlayer.xaml
View
10 OpenAttractor/VideoPlayer.xaml
@@ -27,22 +27,18 @@
</Style>
</Image.Style>
</Image>
-<<<<<<< HEAD
- <s:SurfaceButton x:Name="PlayButton" Click="PlayButton_Click" Background="Transparent" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
-=======
<s:SurfaceButton Background="Transparent" x:Name="PlayButton" Click="PlayButton_Click" HorizontalContentAlignment="Center" VerticalContentAlignment="Center">
->>>>>>> cf61b64d2acf29c252aa8b8b24955e20f0a492cd
<s:SurfaceButton.Content>
<Image Source="/OpenAttractor;component/Resources/video_playbutton_large.png">
- <!--<Image.Style>
+ <Image.Style>
<Style TargetType="{x:Type Image}">
<Style.Triggers>
- <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=s:SurfaceButton}, Path=IsPressed}" DataTrigger.Value="True">
+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=s:SurfaceButton, AncestorLevel=2}, Path=IsPressed}" DataTrigger.Value="True">
<Setter Property="Image.Source" Value="/OpenAttractor;component/Resources/video_playbutton_large_down.png"/>
</DataTrigger>
</Style.Triggers>
</Style>
- </Image.Style>-->
+ </Image.Style>
</Image>
</s:SurfaceButton.Content>
<s:SurfaceButton.Style>
Please sign in to comment.
Something went wrong with that request. Please try again.