--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml Fri Oct 16 22:19:24 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml Sun Oct 18 17:42:21 2009 +0200
@@ -6,7 +6,7 @@
mc:Ignorable="d"
xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
x:Class="FingersDance.Control.Pivot.UserControlPivot"
- x:Name="UserControl" Width="90" Height="90" Foreground="{x:Null}">
+ x:Name="UserControl" Width="88.5" Height="90" Foreground="{x:Null}">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -134,12 +134,12 @@
<RowDefinition Height="0.499*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="0.506*"/>
- <ColumnDefinition Width="0.494*"/>
+ <ColumnDefinition Width="0.515*"/>
+ <ColumnDefinition Width="0.485*"/>
</Grid.ColumnDefinitions>
- <Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Fill="#FF615E5E" Margin="0.462,0,-0.462,0"/>
- <Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="0.47,-5.377,-0.681,-5.83" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}"/>
- <Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="-0.875,-4.844,-0.416,-5.441" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}">
+ <Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Margin="0.72,0.584,-0.915,0.999" Fill="#FFF6F2F2"/>
+ <Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="0.47,-5.252,-0.643,-5.955" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}"/>
+ <Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="-1.413,-4.813,-1.416,-5.472" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" d:LayoutOverrides="HorizontalMargin">
<Custom:SurfaceButton.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="-1" ScaleY="1"/>
@@ -149,7 +149,7 @@
</TransformGroup>
</Custom:SurfaceButton.RenderTransform>
</Custom:SurfaceButton>
- <Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="0.178,-4.737,-0.388,-4.103" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
+ <Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="0.397,-5.393,-0.57,-3.447" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
<Custom:SurfaceButton.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="-1"/>
@@ -159,7 +159,7 @@
</TransformGroup>
</Custom:SurfaceButton.RenderTransform>
</Custom:SurfaceButton>
- <Custom:SurfaceButton Content="" Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="-0.788,-5.521,-0.502,-4.569" Style="{DynamicResource FingersDance.Pivot.Button}" Width="45.75">
+ <Custom:SurfaceButton Content="" Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="-1.419,-6.021,-1.409,-4.069" Style="{DynamicResource FingersDance.Pivot.Button}" Width="45.75">
<Custom:SurfaceButton.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="-1" ScaleY="-1"/>
@@ -169,6 +169,6 @@
</TransformGroup>
</Custom:SurfaceButton.RenderTransform>
</Custom:SurfaceButton>
- <Ellipse Margin="-20.319,0,0,-19" StrokeThickness="0.5" Fill="Black" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="40.655" Height="40.335" Grid.Column="1"/>
+ <Ellipse Margin="0,0,-20.299,-19" StrokeThickness="0.5" Fill="Black" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="40.655" Height="40.335"/>
</Grid>
</UserControl>
\ No newline at end of file