equal
deleted
inserted
replaced
6 mc:Ignorable="d" |
6 mc:Ignorable="d" |
7 xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic" |
7 xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic" |
8 xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player" |
8 xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player" |
9 x:Class="FingersDance.Control.Player.UserControlPlayer" |
9 x:Class="FingersDance.Control.Player.UserControlPlayer" |
10 x:Name="UserControl" AllowDrop="True" Custom:SurfaceDragDrop.DragOver="Play_Pause_area_DragOver" Custom:SurfaceDragDrop.DragEnter="Play_Pause_area_DragEnter" Custom:SurfaceDragDrop.DragLeave="Play_Pause_area_DragLeave" Custom:SurfaceDragDrop.Drop="Play_Pause_area_Drop" |
10 x:Name="UserControl" AllowDrop="True" Custom:SurfaceDragDrop.DragOver="Play_Pause_area_DragOver" Custom:SurfaceDragDrop.DragEnter="Play_Pause_area_DragEnter" Custom:SurfaceDragDrop.DragLeave="Play_Pause_area_DragLeave" Custom:SurfaceDragDrop.Drop="Play_Pause_area_Drop" |
11 Width="560" Height="400" xmlns:GestureControl="clr-namespace:GestureControl;assembly=GestureControl"> |
11 Width="560" Height="400" |
|
12 xmlns:GestureControl="clr-namespace:GestureControl;assembly=GestureControl"> |
12 <UserControl.Resources> |
13 <UserControl.Resources> |
13 <Storyboard x:Key="OnClick1"/> |
14 <Storyboard x:Key="OnClick1"/> |
14 <Style x:Key="FingersDance.Control.PlayerButton" TargetType="{x:Type Custom:SurfaceButton}"> |
15 <Style x:Key="FingersDance.Control.PlayerButton" TargetType="{x:Type Custom:SurfaceButton}"> |
15 <Style.BasedOn> |
16 <Style.BasedOn> |
16 <Style TargetType="{x:Type ButtonBase}"> |
17 <Style TargetType="{x:Type ButtonBase}"> |
188 <Rectangle x:Name="rect1" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
189 <Rectangle x:Name="rect1" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
189 <Rectangle x:Name="rect2" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
190 <Rectangle x:Name="rect2" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
190 <Rectangle x:Name="rect3" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
191 <Rectangle x:Name="rect3" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/> |
191 <Rectangle x:Name="rect4" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" VerticalAlignment="Bottom"/> |
192 <Rectangle x:Name="rect4" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" VerticalAlignment="Bottom"/> |
192 </StackPanel> |
193 </StackPanel> |
193 <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="1"/> |
194 <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="1" GestureEvent="GestureDetected"/> |
194 </Grid> |
195 </Grid> |
195 </Viewbox> |
196 </Viewbox> |
196 </Grid> |
197 </Grid> |
197 </UserControl> |
198 </UserControl> |