--- a/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 16:09:45 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml Tue Sep 15 16:57:45 2009 +0200
@@ -31,10 +31,10 @@
<TranslateTransform X="0" Y="0"/>
</TransformGroup>
</Grid.RenderTransform>
- <FingersDance_Control_UserPanel:UserControlUserPanel/>
+
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
</Grid>
- <Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid4" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}" RenderTransformOrigin="0.5,0.5">
+ <Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid2" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}" RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="-1" ScaleY="-1"/>
@@ -43,14 +43,10 @@
<TranslateTransform X="0" Y="0"/>
</TransformGroup>
</Grid.RenderTransform>
- <FingersDance_Control_UserPanel:UserControlUserPanel/>
+
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
</Grid>
- <Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
- <FingersDance_Control_UserPanel:UserControlUserPanel/>
- <Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
- </Grid>
- <Grid RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" Margin="0,0,0,0" x:Name="Grid2" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
+ <Grid RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" Margin="0,0,0,0" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
<Grid.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="1"/>
@@ -60,11 +56,15 @@
</TransformGroup>
</Grid.RenderTransform>
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
- <FingersDance_Control_UserPanel:UserControlUserPanel/>
+
+ </Grid>
+ <Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid4" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
+
+ <Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
</Grid>
<s:ScatterView x:Name="ScaterView" ContactChanged="ScaterView_ContactChanged">
- <s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" >
- <FingersDance_Control_Pivot:UserControlPivot x:Name="UserControlPivot"/>
+ <s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" >
+ <FingersDance_Control_Pivot:UserControlPivot x:Name="UserControlPivot" EH_SurfaceButtonPlayer1_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer1_ContactDown" EH_SurfaceButtonPlayer2_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer2_ContactDown" EH_SurfaceButtonPlayer3_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer3_ContactDown" EH_SurfaceButtonPlayer4_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer4_ContactDown"/>
</s:ScatterViewItem>
</s:ScatterView>